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

Fix auto-indent behavior correctly

Browse source
This commit is contained in:
aycabta 2019-12-03 13:02:01 +09:00
parent 14a17063a1
commit 027e847cd2
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,9 +366,9 @@ class RubyLex
spaces_of_nest = [] spaces_of_nest = []
spaces_at_line_head = 0 spaces_at_line_head = 0
@tokens.each_with_index do |t, index| @tokens.each_with_index do |t, index|
corresponding_token_depth = nil
case t[1] case t[1]
when :on_ignored_nl, :on_nl, :on_comment when :on_ignored_nl, :on_nl, :on_comment
corresponding_token_depth = nil
spaces_at_line_head = 0 spaces_at_line_head = 0
is_first_spaces_of_line = true is_first_spaces_of_line = true
is_first_printable_of_line = true is_first_printable_of_line = true

9
lib/reline/line_editor.rb
View file

@ -815,12 +815,9 @@ class Reline::LineEditor
@line = ' ' * new_indent + @line.lstrip @line = ' ' * new_indent + @line.lstrip
new_indent = nil new_indent = nil
(new_lines[-2].size + 1).times do |n| result = @auto_indent_proc.(new_lines[0..-2], @line_index - 1, (new_lines[-2].size + 1), false)
result = @auto_indent_proc.(new_lines[0..-2], @line_index - 1, n, false) if result
if result new_indent = result
new_indent = result
break
end
end end
if new_indent&.>= 0 if new_indent&.>= 0
@line = ' ' * new_indent + @line.lstrip @line = ' ' * new_indent + @line.lstrip