h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-27 00:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

complete: automatically resolve REPLACES_TOKEN flag

Browse Source 
This flag is implied by matches that require replacements.  Reflect that
in the Completion::new, reducing the number of places where we raise the
flag.  This slightly simplifies tasks like proving the parent commit.

There are other scenarios (e.g. wildcards) where we currently set
the flag additionally.
This commit is contained in:
Johannes Altmanninger
2026-04-17 00:48:01 +08:00
parent 85e76ba356
commit 8d6426295e
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/complete.rs
View File

@@ -158,15 +158,16 @@ pub fn new(
r#match: StringFuzzyMatch, /* = exact_match */
flags: CompleteFlags,
) -> Self {
let flags = resolve_auto_space(&completion, flags);
let zelf = Self {
let mut flags = resolve_auto_space(&completion, flags);
if r#match.requires_full_replacement() {
flags |= CompleteFlags::REPLACES_TOKEN;
}
Self {
completion,
description,
r#match,
flags,
};
assert!(!zelf.r#match.requires_full_replacement() || zelf.replaces_token());
zelf
}
}
pub fn from_completion(completion: WString) -> Self {
@@ -1484,14 +1485,12 @@ fn complete_param_for_command(
continue;
};
let mut offset = 0;
let mut flags = CompleteFlags::empty();
if r#match.requires_full_replacement() {
flags = CompleteFlags::REPLACES_TOKEN;
let offset = if r#match.requires_full_replacement() {
0
} else {
offset = s.len();
}
s.len()
};
let completion = whole_opt.slice_from(offset);
// does this switch have any known arguments
let has_arg = !o.comp.is_empty();
@@ -1503,14 +1502,14 @@ fn complete_param_for_command(
// a completion. By default we avoid using '=' and instead rely on '--switch
// switch-arg', since it is more commonly supported by homebrew getopt-like
// functions.
let completion = sprintf!("%s=", whole_opt.slice_from(offset));
let completion = sprintf!("%s=", completion);
// Append a long-style option with a mandatory trailing equal sign
if !self.completions.add(Completion::new(
completion,
o.desc.localize().to_owned(),
r#match,
flags | CompleteFlags::NO_SPACE,
CompleteFlags::NO_SPACE,
)) {
return false;
}
@@ -1518,10 +1517,10 @@ fn complete_param_for_command(
// Append a long-style option
if !self.completions.add(Completion::new(
whole_opt.slice_from(offset).to_owned(),
completion.to_owned(),
o.desc.localize().to_owned(),
r#match,
flags,
CompleteFlags::empty(),
)) {
return false;
}
@@ -1667,7 +1666,7 @@ fn complete_variable(&mut self, s: &wstr, start_offset: usize) -> bool {
// Take only the suffix.
env_name.slice_from(varlen).to_owned()
} else {
flags |= CompleteFlags::REPLACES_TOKEN | CompleteFlags::DONT_ESCAPE;
flags |= CompleteFlags::DONT_ESCAPE;
whole_var.slice_to(start_offset).to_owned() + env_name.as_utfstr()
};
@@ -1830,7 +1829,7 @@ fn getpwent_name() -> Option<WString> {
// TODO: propagate overflow?
let mut flags = CompleteFlags::NO_SPACE;
if r#match.requires_full_replacement() {
flags |= CompleteFlags::REPLACES_TOKEN | CompleteFlags::DONT_ESCAPE;
flags |= CompleteFlags::DONT_ESCAPE;
}
let _ = self.completions.add(Completion::new(
if r#match.requires_full_replacement() {

7
src/wildcard.rs
View File

@@ -149,16 +149,11 @@ fn wildcard_complete_internal(
// Note: out_completion may be empty if the completion really is empty, e.g. tab-completing
// 'foo' when a file 'foo' exists.
let local_flags = if full_replacement {
flags | CompleteFlags::REPLACES_TOKEN
} else {
flags
};
if !out.add(Completion::new(
out_completion.to_owned(),
out_desc,
m,
local_flags,
flags,
)) {
return WildcardResult::Overflow;
}