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/reline] Escape newline(s) in dynamic prompt

Browse source 
https://github.com/ruby/reline/commit/9b209ee1ea
This commit is contained in:
aycabta 2021-12-24 20:07:55 +09:00 committed by git
parent b0db420b0e
commit c815c0be46
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/reline/line_editor.rb
View file

@ -121,7 +121,7 @@ class Reline::LineEditor
if use_cached_prompt_list
prompt_list = @cached_prompt_list
else
prompt_list = @cached_prompt_list = @prompt_proc.(buffer)
prompt_list = @cached_prompt_list = @prompt_proc.(buffer).map { |pr| pr.gsub("\n", "\\n") }
@prompt_cache_time = Time.now.to_f
end
prompt_list.map!{ prompt } if @vi_arg or @searching_prompt

8
test/reline/yamatanooroti/multiline_repl
View file

@ -27,6 +27,14 @@ opt.on('--broken-dynamic-prompt') {
opt.on('--dynamic-prompt-returns-empty') {
Reline.prompt_proc = proc { |l| [] }
}
opt.on('--dynamic-prompt-with-newline') {
Reline.prompt_proc = proc { |lines|
range = lines.size > 1 ? (0..(lines.size - 2)) : (0..0)
lines[range].each_with_index.map { |l, i|
'[%04d\n]> ' % i
}
}
}
opt.on('--auto-indent') {
AutoIndent.new
}

12
test/reline/yamatanooroti/test_rendering.rb
View file

@ -1241,6 +1241,18 @@ begin
EOC
end
def test_dynamic_prompt_with_newline
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt-with-newline}, startup_message: 'Multiline REPL.')
write("def hoge\n 3\nend")
close
assert_screen(<<~'EOC')
Multiline REPL.
[0000\n]> def hoge
[0001\n]> 3
[0001\n]> end
EOC
end
def write_inputrc(content)
File.open(@inputrc_file, 'w') do |f|
f.write content