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

Optimize Haml::Buffer#format_script for the case when ugly is true.

Browse source
This commit is contained in:
Nathan Weizenbaum 2008-12-28 14:25:41 -08:00
parent b12ca7c037
commit 69dcc318dc
1 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lib/haml/buffer.rb
View file

@ -106,17 +106,21 @@ RUBY
Haml::Util.def_static_method(self, :format_script, [:result],
:preserve_script, :in_tag, :preserve_tag, :escape_html,
:nuke_inner_whitespace, :interpolated, :ugly, <<RUBY)
# If we're interpolated,
# then the custom tabulation is handled in #push_text.
# The easiest way to avoid is is to reset @tabulation.
<% if !ugly && interpolated %>
old_tabulation = @tabulation
@tabulation = 0
<% unless ugly %>
# If we're interpolated,
# then the custom tabulation is handled in #push_text.
# The easiest way to avoid it here is to reset @tabulation.
<% if interpolated %>
old_tabulation = @tabulation
@tabulation = 0
<% end %>
tabulation = @real_tabs
result = result.to_s.rstrip
<% else %>
result = result.to_s
<% end %>
tabulation = @real_tabs
result = result.to_s.rstrip
<% if escape_html %> result = html_escape(result) <% end %>
<% if preserve_tag %>
@ -125,38 +129,41 @@ RUBY
result = Haml::Helpers.find_and_preserve(result, options[:preserve])
<% end %>
<% if in_tag && !nuke_inner_whitespace %>
<% unless ugly || preserve_tag %> if !(has_newline = result.include?("\\n")) <% end %>
@real_tabs -= 1
<% if !ugly && interpolated %> @tabulation = old_tabulation <% end %>
<% if ugly %>
return result
<% unless ugly || preserve_tag %> end <% end %>
<% end %>
<% else %>
# Precompiled tabulation may be wrong
<% if !interpolated && !in_tag && !ugly %>
result = tabs + result if @tabulation > 0
<% end %>
has_newline = result.include?("\\n")
<% if in_tag && !nuke_inner_whitespace %>
<% unless preserve_tag %> if !has_newline <% end %>
@real_tabs -= 1
<% if interpolated %> @tabulation = old_tabulation <% end %>
return result
<% unless preserve_tag %> end <% end %>
<% end %>
<% if !ugly %>
if has_newline ||= result.include?("\\n")
# Precompiled tabulation may be wrong
<% if !interpolated && !in_tag %>
result = tabs + result if @tabulation > 0
<% end %>
if has_newline
result = result.gsub "\\n", "\\n" + tabs(tabulation)
# Add tabulation if it wasn't precompiled
<% if in_tag && !nuke_inner_whitespace %> result = tabs(tabulation) + result <% end %>
end
<% end %>
<% if in_tag && !nuke_inner_whitespace %> result = "\\n" + result <% end %>
<% unless nuke_inner_whitespace %> result << "\\n" <% end %>
<% if in_tag && !nuke_inner_whitespace %> result = "\\n" + result <% end %>
<% unless nuke_inner_whitespace %> result << "\\n" <% end %>
<% if in_tag && !nuke_inner_whitespace %>
# We never get here if ugly is true
result << tabs(tabulation-1)
@real_tabs -= 1
<% if in_tag && !nuke_inner_whitespace %>
result << tabs(tabulation-1)
@real_tabs -= 1
<% end %>
<% if interpolated %> @tabulation = old_tabulation <% end %>
result
<% end %>
<% if !ugly && interpolated %> @tabulation = old_tabulation <% end %>
result
RUBY
# Takes the various information about the opening tag for an