Merge pull request #669 from hannu/ignore-block-line-nums

Fix: Ignored blocks should not change line numbering
SC5 · Jun 16, 2015 · bb40b7d · bb40b7d
2 parents e32e149 + dfc2088
commit bb40b7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/modules/ignore-block.js b/lib/modules/ignore-block.js
@@ -5,10 +5,14 @@ function removeIgnoredBlocks(string) {
     ignoreEnabled = false;
   lines.forEach(function(line) {
     if (line.indexOf('styleguide:ignore:start') !== -1) {
+      results.push('');
       ignoreEnabled = true;
     } else if (line.indexOf('styleguide:ignore:end') !== -1) {
+      results.push('');
       ignoreEnabled = false;
-    } else if (!ignoreEnabled) {
+    } else if (ignoreEnabled) {
+      results.push('');
+    } else {
       results.push(line);
     }
   });

diff --git a/test/unit/modules/ignore-block.test.js b/test/unit/modules/ignore-block.test.js
@@ -18,7 +18,7 @@ styleguide:ignore:end
 Last line
     */
     });
-    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line\nLast line');
+    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line\n\n\n\n\nLast line');
   });
 
   it('should remove everything on the same line as tags', function() {
@@ -32,7 +32,7 @@ Ignore 2
 Last line
     */
     });
-    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line\nLast line');
+    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line\n\n\n\n\nLast line');
   });
 
   it('should support multiple blocks', function() {
@@ -49,7 +49,7 @@ styleguide:ignore:end
 Last line
     */
     });
-    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line\nMiddle line\nLast line');
+    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line\n\n\n\nMiddle line\n\n\n\nLast line');
   });
 
   it('should remove everything after start tag even if it is not closed', function() {
@@ -62,6 +62,6 @@ Ignore 2
 Ignore 3
     */
     });
-    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line');
+    expect(ignoreBlock.removeIgnoredBlocks(str)).to.eql('First line\n\n\n\n');
   });
 });