Merge pull request #1539 from aausch/correct_tag_trimming

Correct tag trimming
hexojs · Oct 9, 2015 · cd0d987 · cd0d987
2 parents 534102e + ea0e2cb
commit cd0d987
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lib/extend/tag.js b/lib/extend/tag.js
@@ -119,7 +119,7 @@ NunjucksBlock.prototype.run = function(context, args, body) {
 };
 
 function trimBody(body) {
- return stripIndent(body()).trim();
+ return stripIndent(body()).replace(/^\n?|\n?$/g, '');
 }
 
 function NunjucksAsyncTag(name, fn) {

diff --git a/lib/plugins/tag/code.js b/lib/plugins/tag/code.js
@@ -51,7 +51,7 @@ module.exports = function(ctx) {
  caption = '<span>' + match[1] + '</span>';
  }
 
- content = stripIndent(content).trim();
+ content = stripIndent(content);
 
  content = highlight(content, {
  lang: lang,

diff --git a/test/scripts/tags/code.js b/test/scripts/tags/code.js
@@ -29,6 +29,19 @@ describe('code', function() {
  result.should.eql(highlight(fixture));
  });
 
+ it('non standard indent', function() {
+ var nonStandardIndent = [
+ ' ',
+ ' return x;',
+ '}',
+ '',
+ fixture,
+ ' '
+ ].join('/n');
+ var result = code('', nonStandardIndent);
+ result.should.eql(highlight(nonStandardIndent));
+ });
+
  it('lang', function() {
  var result = code('lang:js', fixture);
  result.should.eql(highlight(fixture, {lang: 'js'}));