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

Reline 0.5.0.pre #614

Merged
merged 15 commits into from
Mar 19, 2024
Merged

Reline 0.5.0.pre #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
44706f6
Re-architecture LineEditor's internal state and rendering
tompng Dec 1, 2023
f0860b7
Fix test related to LineEditor re-architecture
tompng Dec 1, 2023
821f0c3
Bump to 0.5.0.pre.1
tompng Dec 1, 2023
57e1106
Hide cursor only when updating screen. Frequent hide&show makes curso…
tompng Dec 2, 2023
389337a
Simplify rerender call from reline.rb
tompng Jan 7, 2024
b54424a
Simplify handle_cleared
tompng Jan 22, 2024
934b840
Add description of updating pasting_state inserts continuous_insertio…
tompng Jan 22, 2024
83b6e09
Use meaningful block parameter
tompng Jan 22, 2024
7cc44c0
Fix use of `@cursor_y`
tompng Jan 24, 2024
dcd1c9d
Remove useless instance_variable_set in test
tompng Jan 24, 2024
3e30a59
Always initialize instance variables to avoid ruby 2.7 warning, remov…
tompng Jan 24, 2024
049c632
Call update_dialogs from reline.rb before first render
tompng Jan 24, 2024
2fcf837
Combine state representing rendered screen information into `@rendere…
tompng Feb 24, 2024
f0f0afc
Rename editor_cursor_ to wrapped_cursor
tompng Feb 24, 2024
97d76d8
Remove unused code, tweak, add comment
tompng Mar 19, 2024
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
37 changes: 17 additions & 20 deletions lib/reline.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ def initialize
@dialog_proc_list = {}
yield self
@completion_quote_character = nil
@bracketed_paste_finished = false
end

def io_gate
Expand Down Expand Up @@ -278,8 +277,13 @@ 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
# Return nil if the input is aborted by C-d.
nil
tompng marked this conversation as resolved.
Show resolved Hide resolved
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,30 +341,24 @@ def readline(prompt = '', add_hist = false)
io_gate.set_default_key_bindings(config)
end

line_editor.print_nomultiline_prompt(prompt)
line_editor.update_dialogs
Comment on lines +344 to +345
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please let me know for study purposes. Why do I need to update dialogs before read_io?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reline has an ability to always show dialog. Reline needs to setup and render dialog on initial render, before first read_io.

irb(main):001> Reline.add_dialog_proc(:FOO,->{Reline::DialogRenderInfo.new contents:['DIALOG'], pos: cursor_pos})
irb(main):002> 
               DIALOG

This is tested in test_dialog_narrower_than_screen and test_dialog_with_fullwidth_scrollbar

line_editor.rerender

begin
line_editor.set_signal_handlers
prev_pasting_state = false
loop do
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
}
if @bracketed_paste_finished
line_editor.rerender_all
@bracketed_paste_finished = false
end
inputs.each { |key| line_editor.update(key) }
}
if prev_pasting_state == true and not io_gate.in_pasting? and not line_editor.finished?
line_editor.set_pasting_state(false)
prev_pasting_state = false
line_editor.rerender_all
if line_editor.finished?
line_editor.render_finished
break
else
line_editor.set_pasting_state(io_gate.in_pasting?)
line_editor.rerender
end
break if line_editor.finished?
end
io_gate.move_cursor_column(0)
rescue Errno::EIO
Expand Down Expand Up @@ -395,7 +393,6 @@ def readline(prompt = '', add_hist = false)
c = io_gate.getc(Float::INFINITY)
if c == -1
result = :unmatched
@bracketed_paste_finished = true
else
buffer << c
result = key_stroke.match_status(buffer)
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