Skip to content

fix: prevent prompt corruption in fish v4 #982

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

Merged
merged 5 commits into from
Jun 10, 2025
Merged

fix: prevent prompt corruption in fish v4 #982

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
023e52d
fix: prevent prompt corruption in fish v4
lamchau Jun 6, 2025
0076018
fix: add version check for fish v4+
lamchau Jun 6, 2025
fcbd6c3
style: use long options for self-documentation
lamchau Jun 7, 2025
a7efad2
docs: add references to fish
lamchau Jun 7, 2025
d62f8c7
Update navi.plugin.fish
alexis-opolka Jun 10, 2025
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
26 changes: 26 additions & 0 deletions shell/navi.plugin.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,43 @@
function _navi_smart_replace
set --local query (commandline --current-process | string trim)
set --local version_parts ""
if test -n "$version"
set version_parts (string split '.' $version)
else
set version_parts (string split '.' (string match -r '\d+\.\d+\.\d+' (fish --version)))
end

set --local force_repaint false
# https://github.com/fish-shell/fish-shell/blob/d663f553dffba460d6d0bcdf93df21bda9ec6f3f/doc_src/interactive.rst?plain=1#L440
# > Bindings that change the mode are supposed to call the repaint-mode bind function
#
# Related issues
# - https://github.com/fish-shell/fish-shell/issues/5033
# - https://github.com/fish-shell/fish-shell/issues/5860
# - https://github.com/fish-shell/fish-shell/blob/d663f553dffba460d6d0bcdf93df21bda9ec6f3f/src/screen.rs#L531
#
# Introduced with: https://github.com/denisidoro/navi/pull/982
if test $version_parts[1] -ge 4
set force_repaint true
end

if test -n "$query"
set --local best_match (navi --print --query "$query" --best-match)
if test -n "$best_match"
commandline --current-process $best_match
if test "$force_repaint" = true
commandline --function repaint
end
return
end
end

set --local candidate (navi --print --query "$query")
if test -n "$candidate"
commandline --current-process $candidate
if test "$force_repaint" = true
commandline --function repaint
end
end
end

Expand Down