diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 20:04:25 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 20:04:25 +0000 |
commit | 05215d0d80bc389a8efe8c9a6a7f0fa01671cda1 (patch) | |
tree | 744bec065367844b64f8883b57d1ce1f34792d11 /lib/erb.rb | |
parent | f5b840074d56c45acb5ab4ab1d662501528490a9 (diff) |
merge revision(s) 58823: [Backport #11464]
erb.rb: Allow trimming carriage return
when trim_mode is "<>", for Windows environments.
[Bug #11464]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/erb.rb')
-rw-r--r-- | lib/erb.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index 9483711024..55e7034ac5 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -392,7 +392,7 @@ class ERB @scan_reg = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m @scan_line = self.method(:trim_line1) elsif @trim_mode == '<>' - @scan_reg = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m + @scan_reg = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m @scan_line = self.method(:trim_line2) elsif @trim_mode == '-' @scan_reg = /(.*?)(^[ \t]*<%\-|<%\-|-%>\n|-%>|#{(stags + etags).join('|')}|\z)/m @@ -457,7 +457,7 @@ class ERB tokens.each do |token| next if token.empty? head = token unless head - if token == "%>\n" + if token == "%>\n" || token == "%>\r\n" yield('%>') if is_erb_stag?(head) yield(:cr) |