From b82ed2ce61923636ba679b76e7369d84f8c4e726 Mon Sep 17 00:00:00 2001
From: k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 20 May 2017 17:17:22 +0000
Subject: erb.rb: Allow explicit trimming carriage return

when trim_mode is "-", for Windows environments.

[ruby-core:39625] [Bug #5339]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/erb.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/erb.rb')

diff --git a/lib/erb.rb b/lib/erb.rb
index 57d068a331..6af69c94a7 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -395,7 +395,7 @@ class ERB
           @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
+          @scan_reg  = /(.*?)(^[ \t]*<%\-|<%\-|-%>\r?\n|-%>|#{(stags + etags).join('|')}|\z)/m
           @scan_line = self.method(:explicit_trim_line)
         else
           @scan_reg  = /(.*?)(#{(stags + etags).join('|')}|\n|\z)/m
@@ -479,7 +479,7 @@ class ERB
             next if token.empty?
             if @stag.nil? && /[ \t]*<%-/ =~ token
               yield('<%')
-            elsif @stag && token == "-%>\n"
+            elsif @stag && (token == "-%>\n" || token == "-%>\r\n")
               yield('%>')
               yield(:cr)
             elsif @stag && token == '-%>'
@@ -534,7 +534,7 @@ class ERB
               yield('<%')
             elsif elem == '-%>'
               yield('%>')
-              yield(:cr) if scanner.scan(/(\n|\z)/)
+              yield(:cr) if scanner.scan(/(\r?\n|\z)/)
             else
               yield(elem)
             end
-- 
cgit v1.2.3