diff options
| author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-20 17:36:09 +0000 |
|---|---|---|
| committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-20 17:36:09 +0000 |
| commit | 64c914706ebeeda42892c6e0a4082cff75e76a1f (patch) | |
| tree | 3b655e4a22f84cbdfb05f48c521f869eb9019d4b /lib | |
| parent | b82ed2ce61923636ba679b76e7369d84f8c4e726 (diff) | |
erb.rb: Allow trimming CR in all trim_modes
to unify a behavior with r58823 and r58825.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -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 6af69c94a7..182a42437f 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -389,7 +389,7 @@ class ERB @trim_mode = trim_mode @percent = percent if @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_line1) elsif @trim_mode == '<>' @scan_reg = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m @@ -441,7 +441,7 @@ class ERB line.scan(@scan_reg) do |tokens| tokens.each do |token| next if token.empty? - if token == "%>\n" + if token == "%>\n" || token == "%>\r\n" yield('%>') yield(:cr) else |