[ruby/irb] handle rescue modifier properly
https://github.com/ruby/irb/commit/6de1341f5e
This commit is contained in:
parent
22d38d5475
commit
f6e789e3b0
@ -324,7 +324,7 @@ class RubyLex
|
|||||||
when 'def', 'case', 'for', 'begin', 'class', 'module'
|
when 'def', 'case', 'for', 'begin', 'class', 'module'
|
||||||
indent += 1
|
indent += 1
|
||||||
when 'if', 'unless', 'while', 'until'
|
when 'if', 'unless', 'while', 'until'
|
||||||
# postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL
|
# postfix if/unless/while/until must be Ripper::EXPR_LABEL
|
||||||
indent += 1 unless t[3].allbits?(Ripper::EXPR_LABEL)
|
indent += 1 unless t[3].allbits?(Ripper::EXPR_LABEL)
|
||||||
when 'end'
|
when 'end'
|
||||||
indent -= 1
|
indent -= 1
|
||||||
@ -369,12 +369,12 @@ class RubyLex
|
|||||||
end
|
end
|
||||||
when 'def', 'case', 'for', 'begin', 'class', 'module'
|
when 'def', 'case', 'for', 'begin', 'class', 'module'
|
||||||
depth_difference += 1
|
depth_difference += 1
|
||||||
when 'if', 'unless', 'while', 'until'
|
when 'if', 'unless', 'while', 'until', 'rescue'
|
||||||
# postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL
|
# postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL
|
||||||
unless t[3].allbits?(Ripper::EXPR_LABEL)
|
unless t[3].allbits?(Ripper::EXPR_LABEL)
|
||||||
depth_difference += 1
|
depth_difference += 1
|
||||||
end
|
end
|
||||||
when 'else', 'elsif', 'rescue', 'ensure', 'when', 'in'
|
when 'else', 'elsif', 'ensure', 'when', 'in'
|
||||||
depth_difference += 1
|
depth_difference += 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -420,12 +420,16 @@ class RubyLex
|
|||||||
case t[2]
|
case t[2]
|
||||||
when 'def', 'do', 'case', 'for', 'begin', 'class', 'module'
|
when 'def', 'do', 'case', 'for', 'begin', 'class', 'module'
|
||||||
spaces_of_nest.push(spaces_at_line_head)
|
spaces_of_nest.push(spaces_at_line_head)
|
||||||
|
when 'rescue'
|
||||||
|
unless t[3].allbits?(Ripper::EXPR_LABEL)
|
||||||
|
corresponding_token_depth = spaces_of_nest.last
|
||||||
|
end
|
||||||
when 'if', 'unless', 'while', 'until'
|
when 'if', 'unless', 'while', 'until'
|
||||||
# postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL
|
# postfix if/unless/while/until must be Ripper::EXPR_LABEL
|
||||||
unless t[3].allbits?(Ripper::EXPR_LABEL)
|
unless t[3].allbits?(Ripper::EXPR_LABEL)
|
||||||
spaces_of_nest.push(spaces_at_line_head)
|
spaces_of_nest.push(spaces_at_line_head)
|
||||||
end
|
end
|
||||||
when 'else', 'elsif', 'rescue', 'ensure', 'when', 'in'
|
when 'else', 'elsif', 'ensure', 'when', 'in'
|
||||||
corresponding_token_depth = spaces_of_nest.last
|
corresponding_token_depth = spaces_of_nest.last
|
||||||
when 'end'
|
when 'end'
|
||||||
if is_first_printable_of_line
|
if is_first_printable_of_line
|
||||||
|
@ -178,5 +178,32 @@ module TestIRB
|
|||||||
assert_indenting(lines, row.new_line_spaces, true)
|
assert_indenting(lines, row.new_line_spaces, true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_mixed_rescue
|
||||||
|
input_with_correct_indents = [
|
||||||
|
Row.new(%q(def m), nil, 2),
|
||||||
|
Row.new(%q( begin), nil, 4),
|
||||||
|
Row.new(%q( begin), nil, 6),
|
||||||
|
Row.new(%q( x = a rescue 4), nil, 6),
|
||||||
|
Row.new(%q( y = [(a rescue 5)]), nil, 6),
|
||||||
|
Row.new(%q( [x, y]), nil, 6),
|
||||||
|
Row.new(%q( rescue => e), 4, 6),
|
||||||
|
Row.new(%q( raise e rescue 8), nil, 6),
|
||||||
|
Row.new(%q( end), 4, 4),
|
||||||
|
Row.new(%q( rescue), 2, 4),
|
||||||
|
Row.new(%q( raise rescue 11), nil, 4),
|
||||||
|
Row.new(%q( end), 2, 2),
|
||||||
|
Row.new(%q(rescue => e), 0, 2),
|
||||||
|
Row.new(%q( raise e rescue 14), nil, 2),
|
||||||
|
Row.new(%q(end), 0, 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
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user