kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/irb] Suppress incomplete encoding magic comment error

Browse source 
https://github.com/ruby/irb/commit/443e90af80
This commit is contained in:
aycabta 2020-06-01 19:22:50 +09:00
parent 78ccab2530
commit 1dfd24a7fc
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/irb/ruby-lex.rb
View file

@ -34,8 +34,9 @@ class RubyLex
begin
result = yield code
rescue ArgumentError => e
if e.message.match?(/unknown encoding name/) && code.match?(/\A(?<shebang>#.*\n)?#\s*coding\s*:.*(?<nl>\n)?/)
code = code.gsub(/\A(?<shebang>#.*\n)?#\s*coding\s*:.*(?<nl>\n)?/, "\\k<shebang>#\\k<nl>")
magic_comment_regexp = /\A(?<shebang>#.*\n)?#\s*(?:encoding|coding)\s*:.*(?<nl>\n)?/
if e.message.match?(/unknown encoding name/) && code.match?(magic_comment_regexp)
code = code.gsub(magic_comment_regexp, "\\k<shebang>#\\k<nl>")
retry
end
end

13
test/irb/test_ruby_lex.rb
View file

@ -139,5 +139,18 @@ module TestIRB
assert_indenting(lines, row.new_line_spaces, true)
end
end
def test_incomplete_encoding_magic_comment
input_with_correct_indents = [
Row.new(%q(#encoding:u), nil, 0),
]
lines = []
input_with_correct_indents.each do |row|
lines << row.content
assert_indenting(lines, row.current_line_spaces, false)
assert_indenting(lines, row.new_line_spaces, true)
end
end
end
end