Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor waiting_proc and waiting_operator_proc #626

Closed
wants to merge 7 commits into from
Closed

Refactor waiting_proc and waiting_operator_proc #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
329d4ca
Re-architecture LineEditor's internal state and rendering
tompng Dec 1, 2023
db45f14
Fix test related to LineEditor re-architecture
tompng Dec 1, 2023
835c45e
Bump to 0.5.0.pre.1
tompng Dec 1, 2023
0b421c5
Hide cursor only when updating screen. Frequent hide&show makes curso…
tompng Dec 2, 2023
db54c8c
Fix waiting_proc precedence
tompng Dec 30, 2023
5fb8c06
Fix waiting_operator bugs
tompng Dec 30, 2023
d35592d
Add waiting_proc and vi_waiting_operator test
tompng Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions lib/reline.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,12 @@ def readmultiline(prompt = '', add_hist = false, &confirm_multiline_termination)
Reline::HISTORY << whole_buffer
end

line_editor.reset_line if line_editor.whole_buffer.nil?
whole_buffer
if line_editor.eof?
line_editor.reset_line
nil
else
whole_buffer
end
end
end

Expand Down Expand Up @@ -326,7 +330,7 @@ def readline(prompt = '', add_hist = false)
line_editor.prompt_proc = prompt_proc
line_editor.auto_indent_proc = auto_indent_proc
line_editor.dig_perfect_match_proc = dig_perfect_match_proc
line_editor.pre_input_hook = pre_input_hook
pre_input_hook&.call
@dialog_proc_list.each_pair do |name_sym, d|
line_editor.add_dialog_proc(name_sym, d.dialog_proc, d.context)
end
Expand All @@ -337,6 +341,7 @@ def readline(prompt = '', add_hist = false)
io_gate.set_default_key_bindings(config)
end

line_editor.print_nomultiline_prompt(prompt)
line_editor.rerender

begin
Expand All @@ -346,10 +351,8 @@ def readline(prompt = '', add_hist = false)
prev_pasting_state = io_gate.in_pasting?
read_io(config.keyseq_timeout) { |inputs|
line_editor.set_pasting_state(io_gate.in_pasting?)
inputs.each { |c|
line_editor.input_key(c)
line_editor.rerender
}
inputs.each { |c| line_editor.update(c) }
line_editor.rerender
if @bracketed_paste_finished
line_editor.rerender_all
@bracketed_paste_finished = false
Expand Down
2 changes: 1 addition & 1 deletion lib/reline/general_io.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def self.ungetc(c)
end

def self.get_screen_size
[1, 1]
[24, 80]
end

def self.cursor_pos
Expand Down
Loading
Loading