diff options
| -rw-r--r-- | lib/erb.rb | 4 | ||||
| -rw-r--r-- | test/erb/test_erb.rb | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 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) diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 6a07f9c5cb..70713e6384 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -197,6 +197,11 @@ EOS assert_equal(ans, erb.result) end + def test_trim_line2_with_carriage_return + erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '<>') + assert_equal("line\r\n" * 3, erb.result) + end + class Foo; end def test_def_class @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-07-10" -#define RUBY_PATCHLEVEL 140 +#define RUBY_PATCHLEVEL 141 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 |