Don't append extra newline when using |indent filter

Fixes #1231
mozilla · Jul 19, 2020 · 3071f42 · 3071f42
1 parent 73a4eb3
commit 3071f42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/nunjucks/src/filters.js b/nunjucks/src/filters.js
@@ -182,8 +182,8 @@ function indent(str, width, indentfirst) {
   const sp = lib.repeat(' ', width);
 
   const res = lines.map((l, i) => {
-    return (i === 0 && !indentfirst) ? `${l}\n` : `${sp}${l}\n`;
-  }).join('');
+    return (i === 0 && !indentfirst) ? l : `${sp}${l}`;
+  }).join('\n');
 
   return r.copySafeness(str, res);
 }

diff --git a/tests/filters.js b/tests/filters.js
@@ -405,15 +405,15 @@
 
     it('indent', function(done) {
       equal('{{ "one\ntwo\nthree" | indent }}',
-        'one\n    two\n    three\n');
+        'one\n    two\n    three');
       equal('{{ "one\ntwo\nthree" | indent(2) }}',
-        'one\n  two\n  three\n');
+        'one\n  two\n  three');
       equal('{{ "one\ntwo\nthree" | indent(2, true) }}',
-        '  one\n  two\n  three\n');
+        '  one\n  two\n  three');
 
       equal('{{ str | indent }}', {
         str: r.markSafe('one\ntwo\nthree')
-      }, 'one\n    two\n    three\n');
+      }, 'one\n    two\n    three');
 
       equal('{{ "" | indent }}', '');
       equal('{{ undefined | indent }}', '');