mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Warn compile_error only when input is finished
Let's say we are in progress to write `"foo"`:
```
irb> "fo
```
at this moment, nothing is wrong.
It would be just a normal way to write `"foo"`.
Prior to this commit, the `fo` part was warned because of
5b64d7ac6e
. But I think warning such a
normal input is not valuable for users.
However, we'd like to warn `:@1` or `@@1` which is also a syntax error.
Then this commit switches the syntax highlight based on whether the
input text is finished or not. When it's not finished yet, it does not
warn compile_error.
This commit is contained in:
parent
6e052817f9
commit
cb40a21da0
4 changed files with 70 additions and 22 deletions
|
@ -98,14 +98,17 @@ module IRB # :nodoc:
|
||||||
"#{seq}#{text}#{clear}"
|
"#{seq}#{text}#{clear}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def colorize_code(code)
|
# If `complete` is false (code is incomplete), this does not warm compile_error.
|
||||||
|
# This option is needed to avoid warning a user when the compile_error is happening
|
||||||
|
# because the input is not wrong but just incomplete.
|
||||||
|
def colorize_code(code, complete: true)
|
||||||
return code unless colorable?
|
return code unless colorable?
|
||||||
|
|
||||||
symbol_state = SymbolState.new
|
symbol_state = SymbolState.new
|
||||||
colored = +''
|
colored = +''
|
||||||
length = 0
|
length = 0
|
||||||
|
|
||||||
scan(code) do |token, str, expr|
|
scan(code, detect_compile_error: complete) do |token, str, expr|
|
||||||
in_symbol = symbol_state.scan_token(token)
|
in_symbol = symbol_state.scan_token(token)
|
||||||
str.each_line do |line|
|
str.each_line do |line|
|
||||||
line = Reline::Unicode.escape_for_print(line)
|
line = Reline::Unicode.escape_for_print(line)
|
||||||
|
@ -127,23 +130,29 @@ module IRB # :nodoc:
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def scan(code)
|
def scan(code, detect_compile_error:)
|
||||||
pos = [1, 0]
|
if detect_compile_error
|
||||||
|
pos = [1, 0]
|
||||||
|
|
||||||
Ripper::Lexer.new(code).scan.each do |elem|
|
Ripper::Lexer.new(code).scan.each do |elem|
|
||||||
str = elem.tok
|
str = elem.tok
|
||||||
next if ([elem.pos[0], elem.pos[1] + str.bytesize] <=> pos) <= 0
|
next if ([elem.pos[0], elem.pos[1] + str.bytesize] <=> pos) <= 0
|
||||||
|
|
||||||
str.each_line do |line|
|
str.each_line do |line|
|
||||||
if line.end_with?("\n")
|
if line.end_with?("\n")
|
||||||
pos[0] += 1
|
pos[0] += 1
|
||||||
pos[1] = 0
|
pos[1] = 0
|
||||||
else
|
else
|
||||||
pos[1] += line.bytesize
|
pos[1] += line.bytesize
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
yield(elem.event, str, elem.state)
|
yield(elem.event, str, elem.state)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
ParseErrorLexer.new(code).parse.sort_by(&:pos).each do |elem|
|
||||||
|
yield(elem.event, elem.tok, elem.state)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -162,6 +171,15 @@ module IRB # :nodoc:
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
class ParseErrorLexer < Ripper::Lexer
|
||||||
|
if method_defined?(:token)
|
||||||
|
def on_parse_error(mesg)
|
||||||
|
@buf.push Elem.new([lineno(), column()], __callee__, token(), state())
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
private_constant :ParseErrorLexer
|
||||||
|
|
||||||
# A class to manage a state to know whether the current token is for Symbol or not.
|
# A class to manage a state to know whether the current token is for Symbol or not.
|
||||||
class SymbolState
|
class SymbolState
|
||||||
def initialize
|
def initialize
|
||||||
|
|
|
@ -224,9 +224,9 @@ module IRB
|
||||||
Reline.completion_proc = IRB::InputCompletor::CompletionProc
|
Reline.completion_proc = IRB::InputCompletor::CompletionProc
|
||||||
Reline.output_modifier_proc =
|
Reline.output_modifier_proc =
|
||||||
if IRB.conf[:USE_COLORIZE]
|
if IRB.conf[:USE_COLORIZE]
|
||||||
proc do |output|
|
proc do |output, complete:|
|
||||||
next unless IRB::Color.colorable?
|
next unless IRB::Color.colorable?
|
||||||
IRB::Color.colorize_code(output)
|
IRB::Color.colorize_code(output, complete: complete)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
proc do |output|
|
proc do |output|
|
||||||
|
|
|
@ -436,6 +436,8 @@ class Reline::LineEditor
|
||||||
line = modify_lines(whole_lines)[@line_index]
|
line = modify_lines(whole_lines)[@line_index]
|
||||||
if @is_multiline
|
if @is_multiline
|
||||||
if finished?
|
if finished?
|
||||||
|
# Always rerender on finish because output_modifier_proc may return a different output.
|
||||||
|
render_partial(prompt, prompt_width, line)
|
||||||
scroll_down(1)
|
scroll_down(1)
|
||||||
Reline::IOGate.move_cursor_column(0)
|
Reline::IOGate.move_cursor_column(0)
|
||||||
Reline::IOGate.erase_after_cursor
|
Reline::IOGate.erase_after_cursor
|
||||||
|
@ -498,7 +500,7 @@ class Reline::LineEditor
|
||||||
private def modify_lines(before)
|
private def modify_lines(before)
|
||||||
return before if before.nil? || before.empty?
|
return before if before.nil? || before.empty?
|
||||||
|
|
||||||
if after = @output_modifier_proc&.call("#{before.join("\n")}\n")
|
if after = @output_modifier_proc&.call("#{before.join("\n")}\n", complete: finished?)
|
||||||
after.lines(chomp: true)
|
after.lines(chomp: true)
|
||||||
else
|
else
|
||||||
before
|
before
|
||||||
|
|
|
@ -23,6 +23,7 @@ module TestIRB
|
||||||
skip "this Ripper version is not supported"
|
skip "this Ripper version is not supported"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Common behaviors. Warn parser error, but do not warn compile error.
|
||||||
{
|
{
|
||||||
"1" => "#{BLUE}#{BOLD}1#{CLEAR}",
|
"1" => "#{BLUE}#{BOLD}1#{CLEAR}",
|
||||||
"2.3" => "#{MAGENTA}#{BOLD}2.3#{CLEAR}",
|
"2.3" => "#{MAGENTA}#{BOLD}2.3#{CLEAR}",
|
||||||
|
@ -40,7 +41,6 @@ module TestIRB
|
||||||
"'a\nb'" => "#{RED}'#{CLEAR}#{RED}a#{CLEAR}\n#{RED}b#{CLEAR}#{RED}'#{CLEAR}",
|
"'a\nb'" => "#{RED}'#{CLEAR}#{RED}a#{CLEAR}\n#{RED}b#{CLEAR}#{RED}'#{CLEAR}",
|
||||||
"4.5.6" => "#{MAGENTA}#{BOLD}4.5#{CLEAR}#{RED}#{REVERSE}.6#{CLEAR}",
|
"4.5.6" => "#{MAGENTA}#{BOLD}4.5#{CLEAR}#{RED}#{REVERSE}.6#{CLEAR}",
|
||||||
"[1]]]" => "[1]]]",
|
"[1]]]" => "[1]]]",
|
||||||
"\e[0m\n" => "#{RED}#{REVERSE}^[#{CLEAR}[#{BLUE}#{BOLD}0#{CLEAR}m\n",
|
|
||||||
"%w[a b]" => "#{RED}%w[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}]#{CLEAR}",
|
"%w[a b]" => "#{RED}%w[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}]#{CLEAR}",
|
||||||
"%i[c d]" => "#{RED}%i[#{CLEAR}#{RED}c#{CLEAR} #{RED}d#{CLEAR}#{RED}]#{CLEAR}",
|
"%i[c d]" => "#{RED}%i[#{CLEAR}#{RED}c#{CLEAR} #{RED}d#{CLEAR}#{RED}]#{CLEAR}",
|
||||||
"{'a': 1}" => "{#{RED}'#{CLEAR}#{RED}a#{CLEAR}#{RED}':#{CLEAR} #{BLUE}#{BOLD}1#{CLEAR}}",
|
"{'a': 1}" => "{#{RED}'#{CLEAR}#{RED}a#{CLEAR}#{RED}':#{CLEAR} #{BLUE}#{BOLD}1#{CLEAR}}",
|
||||||
|
@ -66,10 +66,38 @@ module TestIRB
|
||||||
"\t" => "\t", # not ^I
|
"\t" => "\t", # not ^I
|
||||||
"foo(*%W(bar))" => "foo(*#{RED}%W(#{CLEAR}#{RED}bar#{CLEAR}#{RED})#{CLEAR})",
|
"foo(*%W(bar))" => "foo(*#{RED}%W(#{CLEAR}#{RED}bar#{CLEAR}#{RED})#{CLEAR})",
|
||||||
"$stdout" => "#{GREEN}#{BOLD}$stdout#{CLEAR}",
|
"$stdout" => "#{GREEN}#{BOLD}$stdout#{CLEAR}",
|
||||||
"'foo' + 'bar" => "#{RED}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}'#{CLEAR} + #{RED}'#{CLEAR}#{RED}#{REVERSE}bar#{CLEAR}",
|
|
||||||
}.each do |code, result|
|
}.each do |code, result|
|
||||||
actual = with_term { IRB::Color.colorize_code(code) }
|
actual = with_term { IRB::Color.colorize_code(code, complete: true) }
|
||||||
assert_equal(result, actual, "Case: colorize_code(#{code.dump})\nResult: #{humanized_literal(actual)}")
|
assert_equal(result, actual, "Case: colorize_code(#{code.dump}, complete: true)\nResult: #{humanized_literal(actual)}")
|
||||||
|
|
||||||
|
actual = with_term { IRB::Color.colorize_code(code, complete: false) }
|
||||||
|
assert_equal(result, actual, "Case: colorize_code(#{code.dump}, complete: false)\nResult: #{humanized_literal(actual)}")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_colorize_code_complete_true
|
||||||
|
# `complete: true` behaviors. Warn compile_error.
|
||||||
|
{
|
||||||
|
"\e[0m\n" => "#{RED}#{REVERSE}^[#{CLEAR}[#{BLUE}#{BOLD}0#{CLEAR}m\n",
|
||||||
|
"'foo' + 'bar" => "#{RED}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}'#{CLEAR} + #{RED}'#{CLEAR}#{RED}#{REVERSE}bar#{CLEAR}",
|
||||||
|
":@1" => "#{YELLOW}:#{CLEAR}#{RED}#{REVERSE}@1#{CLEAR}",
|
||||||
|
"@@1" => "#{RED}#{REVERSE}@@1#{CLEAR}",
|
||||||
|
}.each do |code, result|
|
||||||
|
actual = with_term { IRB::Color.colorize_code(code, complete: true) }
|
||||||
|
assert_equal(result, actual, "Case: colorize_code(#{code.dump}, complete: true)\nResult: #{humanized_literal(actual)}")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_colorize_code_complete_false
|
||||||
|
# `complete: false` behaviors. Do not warn compile_error.
|
||||||
|
{
|
||||||
|
"\e[0m\n" => "#{CLEAR}\n",
|
||||||
|
"'foo' + 'bar" => "#{RED}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}'#{CLEAR} + #{RED}'#{CLEAR}#{RED}bar#{CLEAR}",
|
||||||
|
":@1" => "#{YELLOW}:#{CLEAR}#{YELLOW}@1#{CLEAR}",
|
||||||
|
"@@1" => "@@1",
|
||||||
|
}.each do |code, result|
|
||||||
|
actual = with_term { IRB::Color.colorize_code(code, complete: false) }
|
||||||
|
assert_equal(result, actual, "Case: colorize_code(#{code.dump}, complete: false)\nResult: #{humanized_literal(actual)}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue