Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create "substring" match type

Browse Source 
# Description
Similar behavior to zsh's history-substring-search method,
this matching algorithm will check if a given string is contained
within the other, regardless of position.
This commit is contained in:
MilesCranmer 2024-04-22 11:58:50 +01:00
parent bae6d694ca
commit b79d6c3164
No known key found for this signature in database
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-cli/src/completions/completion_options.rs
View File

@ -24,6 +24,12 @@ pub enum MatchAlgorithm {
/// Example:
/// "git checkout" is matched by "gco"
Fuzzy,
/// Only show suggestions which contain the substring starting at any place
///
/// Example:
/// "git checkout" is matched by "check"
Substring
}
impl MatchAlgorithm {
@ -37,6 +43,7 @@ impl MatchAlgorithm {
let matcher = SkimMatcherV2::default();
matcher.fuzzy_match(haystack, needle).is_some()
}
MatchAlgorithm::Substring => haystack.contains(needle),
}
}
@ -51,6 +58,7 @@ impl MatchAlgorithm {
let matcher = SkimMatcherV2::default();
matcher.fuzzy_match(&haystack_str, &needle_str).is_some()
}
MatchAlgorithm::Substring => haystack.windows(needle.len()).any(|window| window == needle),
}
}
}
@ -60,6 +68,7 @@ impl From<CompletionAlgorithm> for MatchAlgorithm {
match value {
CompletionAlgorithm::Prefix => MatchAlgorithm::Prefix,
CompletionAlgorithm::Fuzzy => MatchAlgorithm::Fuzzy,
CompletionAlgorithm::Substring => MatchAlgorithm::Substring,
}
}
}
@ -71,6 +80,7 @@ impl TryFrom<String> for MatchAlgorithm {
match value.as_str() {
"prefix" => Ok(Self::Prefix),
"fuzzy" => Ok(Self::Fuzzy),
"substring" => Ok(Self::Substring),
_ => Err(InvalidMatchAlgorithm::Unknown),
}
}

2
crates/nu-cli/src/completions/custom_completions.rs
View File

@ -163,7 +163,7 @@ fn filter(
}
}
},
MatchAlgorithm::Fuzzy => options
MatchAlgorithm::Fuzzy | MatchAlgorithm::Substring => options
.match_algorithm
.matches_u8(it.suggestion.value.as_bytes(), prefix),
})

3
crates/nu-protocol/src/config/completer.rs
View File

@ -11,6 +11,7 @@ pub enum CompletionAlgorithm {
#[default]
Prefix,
Fuzzy,
Substring,
}
impl FromStr for CompletionAlgorithm {
@ -20,6 +21,7 @@ impl FromStr for CompletionAlgorithm {
match s.to_ascii_lowercase().as_str() {
"prefix" => Ok(Self::Prefix),
"fuzzy" => Ok(Self::Fuzzy),
"substring" => Ok(Self::Substring),
_ => Err("expected either 'prefix' or 'fuzzy'"),
}
}
@ -30,6 +32,7 @@ impl ReconstructVal for CompletionAlgorithm {
let str = match self {
CompletionAlgorithm::Prefix => "prefix",
CompletionAlgorithm::Fuzzy => "fuzzy",
CompletionAlgorithm::Substring => "substring",
};
Value::string(str, span)
}