diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-12 00:37:15 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-12 00:37:15 +0000 |
commit | ab5a3db48e446a33f790fa5e8594a6dc24062987 (patch) | |
tree | b8f6a5b6b1b05b585d7d7432b6cc902906478487 /lib | |
parent | 7e61fdca9a082970e93b0d60ea87572af600b805 (diff) | |
download | ruby-ab5a3db48e446a33f790fa5e8594a6dc24062987.tar.gz |
erb.rb: warn invalid trim_mode [Misc #15294]
From: Justin Collins <justin@presidentbeef.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/erb.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index c9b987dfb7..5b725d7820 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -665,9 +665,13 @@ class ERB return [false, '>'] when 2 return [false, '<>'] - when 0 + when 0, nil return [false, nil] when String + unless mode.match?(/\A(%|-|>|<>){1,2}\z/) + warn_invalid_trim_mode(mode, uplevel: 5) + end + perc = mode.include?('%') if mode.include?('-') return [perc, '-'] @@ -679,6 +683,7 @@ class ERB [perc, nil] end else + warn_invalid_trim_mode(mode, uplevel: 5) return [false, nil] end end @@ -730,6 +735,10 @@ class ERB end return enc, frozen end + + def warn_invalid_trim_mode(mode, uplevel:) + warn "Invalid ERB trim mode: #{mode.inspect} (trim_mode: nil, 0, 1, 2, or String composed of '%' and/or '-', '>', '<>')", uplevel: uplevel + 1 + end end end |