From 1693be0bce7eb616a7e69c3930b824da6f64b57b Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Fri, 2 May 2008 00:48:39 -0700
Subject: [PATCH] Fix another line-reporting bug in Haml.

---
 lib/haml/precompiler.rb  | 2 ++
 test/haml/engine_test.rb | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/haml/precompiler.rb b/lib/haml/precompiler.rb
index 19089377..95d9a5fe 100644
--- a/lib/haml/precompiler.rb
+++ b/lib/haml/precompiler.rb
@@ -139,6 +139,7 @@ END
 
         if old_line.text.nil? || suppress_render
           old_line = line
+          resolve_newlines
           newline
           next
         end
@@ -748,6 +749,7 @@ END
     end
 
     def resolve_newlines
+      return unless @newlines > 0
       @precompiled << "\n" * @newlines
       @newlines = 0
     end
diff --git a/test/haml/engine_test.rb b/test/haml/engine_test.rb
index f2f931fa..8fb9a929 100644
--- a/test/haml/engine_test.rb
+++ b/test/haml/engine_test.rb
@@ -35,7 +35,8 @@ END
 
     # Regression tests
     "- raise 'foo'\n\n\n\nbar" => ["foo", 1],
-    "= 'foo'\n-raise 'foo'" => ["foo", 2]
+    "= 'foo'\n-raise 'foo'" => ["foo", 2],
+    "\n\n\n- raise 'foo'" => ["foo", 4],
   }
 
   User = Struct.new('User', :id)