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

Remove code clone in completion insertion

Browse Source
This commit is contained in:
Johannes Altmanninger 2024-01-27 16:10:18 +01:00
parent 1e5a585875
commit 623ad21b47
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/reader.rs
View File

@ -5121,6 +5121,15 @@ impl ReaderData {
} }
} }
fn try_insert(&mut self, c: &Completion, tok: &wstr, token_range: Range<usize>) {
// If this is a replacement completion, check that we know how to replace it, e.g. that
// the token doesn't contain evil operators like {}.
if !c.flags.contains(CompleteFlags::REPLACES_TOKEN) || reader_can_replace(tok, c.flags)
{
self.completion_insert(&c.completion, token_range.end, c.flags);
}
}
/// Handle the list of completions. This means the following: /// Handle the list of completions. This means the following:
/// ///
/// - If the list is empty, flash the terminal. /// - If the list is empty, flash the terminal.
@ -5137,9 +5146,6 @@ impl ReaderData {
/// ///
/// Return true if we inserted text into the command line, false if we did not. /// Return true if we inserted text into the command line, false if we did not.
fn handle_completions(&mut self, comp: &[Completion], token_range: Range<usize>) -> bool { fn handle_completions(&mut self, comp: &[Completion], token_range: Range<usize>) -> bool {
let mut done = false;
let mut success = false;
let tok = self.command_line.text()[token_range.clone()].to_owned(); let tok = self.command_line.text()[token_range.clone()].to_owned();
// Check trivial cases. // Check trivial cases.
@ -5147,23 +5153,12 @@ impl ReaderData {
if len == 0 { if len == 0 {
// No suitable completions found, flash screen and return. // No suitable completions found, flash screen and return.
self.flash(); self.flash();
done = true; return false;
} else if len == 1 { } else if len == 1 {
// Exactly one suitable completion found - insert it. // Exactly one suitable completion found - insert it.
let c = &comp[0]; let c = &comp[0];
self.try_insert(c, &tok, token_range);
// If this is a replacement completion, check that we know how to replace it, e.g. that return true;
// the token doesn't contain evil operators like {}.
if !c.flags.contains(CompleteFlags::REPLACES_TOKEN) || reader_can_replace(&tok, c.flags)
{
self.completion_insert(&c.completion, token_range.end, c.flags);
}
done = true;
success = true;
}
if done {
return success;
} }
let best_rank = get_best_rank(comp); let best_rank = get_best_rank(comp);
@ -5214,12 +5209,7 @@ impl ReaderData {
// out how to use it more. // out how to use it more.
let c = &surviving_completions[0]; let c = &surviving_completions[0];
// If this is a replacement completion, check that we know how to replace it, e.g. that self.try_insert(c, &tok, token_range);
// the token doesn't contain evil operators like {}.
if !c.flags.contains(CompleteFlags::REPLACES_TOKEN) || reader_can_replace(&tok, c.flags)
{
self.completion_insert(&c.completion, token_range.end, c.flags);
}
return true; return true;
} }