Whitespace after the last non-whitespace character is preserved for filters.
git-svn-id: svn://hamptoncatlin.com/haml/trunk@357 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
parent
9b71d3e339
commit
aa171de2e8
|
@ -200,9 +200,11 @@ END
|
||||||
old_index = nil
|
old_index = nil
|
||||||
old_spaces = nil
|
old_spaces = nil
|
||||||
old_tabs = nil
|
old_tabs = nil
|
||||||
|
old_uline = nil
|
||||||
(@template + "\n-#").each_with_index do |line, index|
|
(@template + "\n-#").each_with_index do |line, index|
|
||||||
spaces, tabs = count_soft_tabs(line)
|
spaces, tabs = count_soft_tabs(line)
|
||||||
line.strip!
|
uline = line.lstrip[0...-1]
|
||||||
|
line = uline.rstrip
|
||||||
|
|
||||||
if !line.empty?
|
if !line.empty?
|
||||||
if old_line
|
if old_line
|
||||||
|
@ -222,7 +224,7 @@ END
|
||||||
end
|
end
|
||||||
|
|
||||||
if flat
|
if flat
|
||||||
push_flat(old_line, old_spaces)
|
push_flat(old_uline, old_spaces)
|
||||||
elsif !line_empty
|
elsif !line_empty
|
||||||
process_line(old_line, old_index, block_opened)
|
process_line(old_line, old_index, block_opened)
|
||||||
end
|
end
|
||||||
|
@ -237,12 +239,14 @@ END
|
||||||
old_index = index
|
old_index = index
|
||||||
old_spaces = spaces
|
old_spaces = spaces
|
||||||
old_tabs = tabs
|
old_tabs = tabs
|
||||||
|
old_uline = uline
|
||||||
elsif @flat_spaces != -1
|
elsif @flat_spaces != -1
|
||||||
process_indent(old_tabs, old_line) unless old_line.empty?
|
process_indent(old_tabs, old_line) unless old_line.empty?
|
||||||
|
|
||||||
if @flat_spaces != -1
|
if @flat_spaces != -1
|
||||||
push_flat(old_line, old_spaces)
|
push_flat(old_line, old_spaces)
|
||||||
old_line = ''
|
old_line = ''
|
||||||
|
old_uline = ''
|
||||||
old_spaces = 0
|
old_spaces = 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue