Fix indented syntax line numbering with DOS lines.

Closes #588
sass · Jan 5, 2013 · ba7bd68 · ba7bd68
1 parent d2d40ed
commit ba7bd68
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -13,6 +13,9 @@
 * Ruby 2.0.0-preview compatibility. Thanks to [Eric
   Saxby](http://www.livinginthepast.org/).
 
+* Fix incorrect line numbering when using DOS line endings with the indented
+  syntax.
+
 ## 3.2.4
 
 * Fix imports from `.jar` files in JRuby. Thanks to [Alex

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
@@ -379,7 +379,7 @@ def tabulate(string)
       comment_tab_str = nil
       first = true
       lines = []
-      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
+      string.gsub(/\r\n|\r|\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         if line.strip.empty?
           lines.last.text << "\n" if lines.last && lines.last.comment?

diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
@@ -2381,6 +2381,21 @@ def test_variables_in_media
 
   # Regression tests
 
+  def test_line_numbers_with_dos_line_endings
+    assert_equal <<CSS, render(<<SASS, :line_comments => true)
+/* line 5, test_line_numbers_with_dos_line_endings_inline.sass */
+.foo {
+  a: b; }
+CSS
+\r
+\r
+\r
+\r
+.foo
+  a: b
+SASS
+  end
+
   def test_variable_in_media_in_mixin
     assert_equal <<CSS, render(<<SASS)
 @media screen and (min-width: 10px) {