1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/irb] Support symbol with backtick

Browse Source 
https://github.com/ruby/irb/commit/0aa2425883
This commit is contained in:
aycabta 2021-09-08 22:19:52 +09:00 committed by git
parent 419e6ed464
commit f085a6fb69
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/irb/ruby-lex.rb
View File

@ -708,6 +708,9 @@ class RubyLex
while i < tokens.size
t = tokens[i]
case t[1]
when *end_type.last
start_token.pop
end_type.pop
when :on_tstring_beg
start_token << t
end_type << [:on_tstring_end, :on_label_end]
@ -715,10 +718,14 @@ class RubyLex
start_token << t
end_type << :on_regexp_end
when :on_symbeg
acceptable_single_tokens = %i{on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int}
if (i + 1) < tokens.size and acceptable_single_tokens.all?{ |st| tokens[i + 1][1] != st }
start_token << t
end_type << :on_tstring_end
acceptable_single_tokens = %i{on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int on_backtick}
if (i + 1) < tokens.size
if acceptable_single_tokens.all?{ |st| tokens[i + 1][1] != st }
start_token << t
end_type << :on_tstring_end
else
i += 1
end
end
when :on_backtick
start_token << t
@ -729,9 +736,6 @@ class RubyLex
when :on_heredoc_beg
start_token << t
end_type << :on_heredoc_end
when *end_type.last
start_token.pop
end_type.pop
end
i += 1
end

20
test/irb/test_ruby_lex.rb
View File

@ -136,6 +136,26 @@ module TestIRB
end
end
def test_symbols
input_with_correct_indents = [
Row.new(%q(:a), nil, 0),
Row.new(%q(:A), nil, 0),
Row.new(%q(:+), nil, 0),
Row.new(%q(:@@a), nil, 0),
Row.new(%q(:@a), nil, 0),
Row.new(%q(:$a), nil, 0),
Row.new(%q(:def), nil, 0),
Row.new(%q(:`), 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
def test_endless_range_at_end_of_line
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
pend 'Endless range is available in 2.6.0 or later'