1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00

Fixed an issue with multiline and empty lines.

git-svn-id: svn://hamptoncatlin.com/haml/branches/edge@170 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
nex3 2006-11-27 00:00:41 +00:00
parent 4e645138c0
commit 6bdf315c4f
3 changed files with 15 additions and 5 deletions

View file

@ -162,7 +162,7 @@ module Haml
suppress_render = handle_multiline(old_tabs, old_line, old_index)
if !suppress_render && old_spaces
if !suppress_render
line_empty = old_line.empty?
process_indent(old_tabs, old_line) unless line_empty
flat = @flat_spaces != -1
@ -250,6 +250,7 @@ module Haml
# This returns whether or not the line should be
# rendered normally.
def handle_multiline(count, line, index)
suppress_render = false
# Multilines are denoting by ending with a `|` (124)
if is_multiline?(line) && @multiline_buffer
# A multiline string is active, and is being continued
@ -264,9 +265,10 @@ module Haml
suppress_render = true
elsif @multiline_buffer
# A multiline string has just ended, make line into the result
process_line(@multiline_buffer, @multiline_index, count > @multiline_count)
@multiline_buffer = nil
suppress_render = false
unless line.empty?
process_line(@multiline_buffer, @multiline_index, count > @multiline_count)
@multiline_buffer = nil
end
end
return suppress_render

View file

@ -69,4 +69,6 @@
<strong>2</strong>
<strong>3</strong>
<strong>4</strong>
<div class='test'>
<p>boom</p>
</div>

View file

@ -32,3 +32,9 @@
do |
|a| |
%strong= a
.test
- "foo |
bar |
baz" |
%p boom