Skip to content

revert: try to coalesce screen updates #59848

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −46
Draft

revert: try to coalesce screen updates #59848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 3 additions & 42 deletions stdlib/REPL/src/LineEdit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ mutable struct PromptState <: ModeState
beeping::Float64
# this option is to detect when code is pasted in non-"bracketed paste mode" :
last_newline::Float64 # register when last newline was entered
# this option is to speed up output
refresh_wait::Union{Timer,Nothing}
end

struct Modifiers
Expand Down Expand Up @@ -524,10 +522,6 @@ function complete_line(s::PromptState, repeats::Int, mod::Module; hint::Bool=fal
end

function clear_input_area(terminal::AbstractTerminal, s::PromptState)
if s.refresh_wait !== nothing
close(s.refresh_wait)
s.refresh_wait = nothing
end
_clear_input_area(terminal, s.ias)
s.ias = InputAreaState(0, 0)
end
Expand Down Expand Up @@ -572,10 +566,6 @@ end
max_highlight_size::Int = 10000 # bytes

function refresh_multi_line(s::PromptState; kw...)
if s.refresh_wait !== nothing
close(s.refresh_wait)
s.refresh_wait = nothing
end
if s.hint isa String
# clear remainder of line which is unknown here if it had a hint before unbeknownst to refresh_multi_line
# the clear line cannot be printed each time because it would break column movement
Expand Down Expand Up @@ -1025,57 +1015,28 @@ function edit_insert(s::PromptState, c::StringLike)
end
end

old_wait = s.refresh_wait !== nothing
if old_wait
close(s.refresh_wait)
s.refresh_wait = nothing
end
str = string(c)
edit_insert(buf, str)
if '\n' in str
refresh_line(s)
else
after = options(s).auto_refresh_time_delay
termbuf = terminal(s)
w = width(termbuf)
offset = s.ias.curs_row == 1 || s.indent < 0 ?
sizeof(prompt_string(s.p.prompt)::String) : s.indent
offset += position(buf) - beginofline(buf) # size of current line
spinner = '\0'
delayup = !eof(buf) || old_wait
# Disable fast path when syntax highlighting is enabled
use_fast_path = offset + textwidth(str) <= w && !(after == 0 && delayup) && !options(s).style_input
use_fast_path = offset + textwidth(str) <= w && eof(buf) && !options(s).style_input
if use_fast_path
# Avoid full update when appending characters to the end
# and an update of curs_row isn't necessary (conservatively estimated)
write(termbuf, str)
spinner = ' ' # temporarily clear under the cursor
elseif after == 0
else
refresh_line(s)
delayup = false
else # render a spinner for each key press
if old_wait || length(str) != 1
spinner = spin_seq[mod1(position(buf) - w, length(spin_seq))]
else
spinner = str[end]
end
delayup = true
end
if delayup
if spinner != '\0'
write(termbuf, spinner)
cmove_left(termbuf)
end
s.refresh_wait = Timer(after) do t
s.refresh_wait === t || return
s.refresh_wait = nothing
refresh_line(s)
end
end
end
nothing
end
const spin_seq = ("⋯", "⋱", "⋮", "⋰")

function edit_insert(buf::IOBuffer, c::StringLike)
if eof(buf)
Expand Down Expand Up @@ -2885,7 +2846,7 @@ run_interface(::Prompt) = nothing

init_state(terminal, prompt::Prompt) =
PromptState(terminal, prompt, IOBuffer(), :off, nothing, IOBuffer[], 1, InputAreaState(1, 1),
#=indent(spaces)=# -1, Threads.SpinLock(), 0.0, -Inf, nothing)
#=indent(spaces)=# -1, Threads.SpinLock(), 0.0, -Inf)

function init_state(terminal, m::ModalInterface)
s = MIState(m, Main, m.modes[1], false, IdDict{Any,Any}())
Expand Down
5 changes: 1 addition & 4 deletions stdlib/REPL/src/options.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ mutable struct Options
auto_indent_bracketed_paste::Bool # set to true if terminal knows paste mode
# cancel auto-indent when next character is entered within this time frame :
auto_indent_time_threshold::Float64
# refresh after time delay
auto_refresh_time_delay::Float64
hint_tab_completes::Bool
style_input::Bool # enable syntax highlighting for input
# default IOContext settings at the REPL
Expand All @@ -48,7 +46,6 @@ Options(;
auto_indent_tmp_off = false,
auto_indent_bracketed_paste = false,
auto_indent_time_threshold = 0.005,
auto_refresh_time_delay = 0.0, # this no longer seems beneficial
hint_tab_completes = true,
style_input = true,
iocontext = Dict{Symbol,Any}()) =
Expand All @@ -58,7 +55,7 @@ Options(;
beep_colors, beep_use_current,
backspace_align, backspace_adjust, confirm_exit,
auto_indent, auto_indent_tmp_off, auto_indent_bracketed_paste,
auto_indent_time_threshold, auto_refresh_time_delay,
auto_indent_time_threshold,
hint_tab_completes, style_input,
iocontext)

Expand Down