github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-17 07:02:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix commandline -C regression handling negative offsets

Browse Source
This commit is contained in:
Johannes Altmanninger 2024-03-10 09:40:44 +01:00
parent 947883c842
commit 94477f3029
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/builtins/commandline.rs
View File

@ -528,8 +528,12 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
Ok(num) => num, Ok(num) => num,
}; };
let new_pos = let new_pos = std::cmp::min(
std::cmp::min(new_pos.max(0) as usize + range.start, current_buffer.len()); range
.start
.saturating_add_signed(isize::try_from(new_pos).unwrap()),
current_buffer.len(),
);
commandline_set_buffer(current_buffer.to_owned(), Some(new_pos)); commandline_set_buffer(current_buffer.to_owned(), Some(new_pos));
} else { } else {
streams.out.append(sprintf!("%lu\n", current_cursor_pos)); streams.out.append(sprintf!("%lu\n", current_cursor_pos));

10
tests/checks/tmux-commandline.fish Normal file
View File

@ -0,0 +1,10 @@
#RUN: %fish %s
#REQUIRES: command -v tmux
isolated-tmux-start
isolated-tmux send-keys 'bind \eg "commandline -p -C -- -4"' Enter C-l
isolated-tmux send-keys 'echo bar|cat' \eg foo
tmux-sleep
isolated-tmux capture-pane -p
# CHECK: prompt 1> echo foobar|cat