Merge pull request #723 from exeba/useless-if-fix

Simpler trimming logic
twigjs · Feb 23, 2020 · f50d1e0 · f50d1e0
2 parents 5f05d14 + 69f27af
commit f50d1e0
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/src/twig.core.js b/src/twig.core.js
@@ -538,12 +538,9 @@ module.exports = function (Twig) {
  if (prevOutput.type === Twig.token.type.raw) {
  output.pop();
 
- // If the previous output is not just whitespace, trim it
- if (prevOutput.value.match(/^\s*$/) === null) {
- prevOutput.value = prevOutput.value.trimEnd();
- // Repush the previous output
- output.push(prevOutput);
- }
+ prevOutput.value = prevOutput.value.trimEnd();
+ // Repush the previous output
+ output.push(prevOutput);
  }
  }
 
@@ -552,12 +549,9 @@ module.exports = function (Twig) {
  if (prevIntermediateOutput.type === Twig.token.type.raw) {
  intermediateOutput.pop();
 
- // If the previous output is not just whitespace, trim it
- if (prevIntermediateOutput.value.match(/^\s*$/) === null) {
- prevIntermediateOutput.value = prevIntermediateOutput.value.trimEnd();
- // Repush the previous intermediate output
- intermediateOutput.push(prevIntermediateOutput);
- }
+ prevIntermediateOutput.value = prevIntermediateOutput.value.trimEnd();
+ // Repush the previous intermediate output
+ intermediateOutput.push(prevIntermediateOutput);
  }
  }
  }
@@ -584,12 +578,9 @@ module.exports = function (Twig) {
  if (nextToken.type === Twig.token.type.raw) {
  tokens.shift();
 
- // If the next token is not just whitespace, trim it
- if (nextToken.value.match(/^\s*$/) === null) {
- nextToken.value = nextToken.value.trimStart();
- // Unshift the next token
- tokens.unshift(nextToken);
- }
+ nextToken.value = nextToken.value.trimStart();
+ // Unshift the next token
+ tokens.unshift(nextToken);
  }
  }
  }