forked from extern/nushell
# Description Add an extension trait `IgnoreCaseExt` to nu_utils which adds some case insensitivity helpers, and use them throughout nu to improve the handling of case insensitivity. Proper case folding is done via unicase, which is already a dependency via mime_guess from nu-command. In actuality a lot of code still does `to_lowercase`, because unicase only provides immediate comparison and doesn't expose a `to_folded_case` yet. And since we do a lot of `contains`/`starts_with`/`ends_with`, it's not sufficient to just have `eq_ignore_case`. But if we get access in the future, this makes us ready to use it with a change in one place. Plus, it's clearer what the purpose is at the call site to call `to_folded_case` instead of `to_lowercase` if it's exclusively for the purpose of case insensitive comparison, even if it just does `to_lowercase` still. # User-Facing Changes - Some commands that were supposed to be case insensitive remained only insensitive to ASCII case (a-z), and now are case insensitive w.r.t. non-ASCII characters as well. # Tests + Formatting - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` --------- Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
172 lines
6.2 KiB
Rust
172 lines
6.2 KiB
Rust
use crate::completions::{Completer, CompletionOptions, MatchAlgorithm, SortBy};
|
|
use nu_engine::eval_call;
|
|
use nu_protocol::{
|
|
ast::{Argument, Call, Expr, Expression},
|
|
engine::{EngineState, Stack, StateWorkingSet},
|
|
PipelineData, Span, Type, Value,
|
|
};
|
|
use nu_utils::IgnoreCaseExt;
|
|
use reedline::Suggestion;
|
|
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
|
|
use super::completer::map_value_completions;
|
|
|
|
pub struct CustomCompletion {
|
|
engine_state: Arc<EngineState>,
|
|
stack: Stack,
|
|
decl_id: usize,
|
|
line: String,
|
|
sort_by: SortBy,
|
|
}
|
|
|
|
impl CustomCompletion {
|
|
pub fn new(engine_state: Arc<EngineState>, stack: Stack, decl_id: usize, line: String) -> Self {
|
|
Self {
|
|
engine_state,
|
|
stack,
|
|
decl_id,
|
|
line,
|
|
sort_by: SortBy::None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Completer for CustomCompletion {
|
|
fn fetch(
|
|
&mut self,
|
|
_: &StateWorkingSet,
|
|
prefix: Vec<u8>,
|
|
span: Span,
|
|
offset: usize,
|
|
pos: usize,
|
|
completion_options: &CompletionOptions,
|
|
) -> Vec<Suggestion> {
|
|
// Line position
|
|
let line_pos = pos - offset;
|
|
|
|
// Call custom declaration
|
|
let result = eval_call(
|
|
&self.engine_state,
|
|
&mut self.stack,
|
|
&Call {
|
|
decl_id: self.decl_id,
|
|
head: span,
|
|
arguments: vec![
|
|
Argument::Positional(Expression {
|
|
span: Span::unknown(),
|
|
ty: Type::String,
|
|
expr: Expr::String(self.line.clone()),
|
|
custom_completion: None,
|
|
}),
|
|
Argument::Positional(Expression {
|
|
span: Span::unknown(),
|
|
ty: Type::Int,
|
|
expr: Expr::Int(line_pos as i64),
|
|
custom_completion: None,
|
|
}),
|
|
],
|
|
redirect_stdout: true,
|
|
redirect_stderr: true,
|
|
parser_info: HashMap::new(),
|
|
},
|
|
PipelineData::empty(),
|
|
);
|
|
|
|
let mut custom_completion_options = None;
|
|
|
|
// Parse result
|
|
let suggestions = result
|
|
.map(|pd| {
|
|
let value = pd.into_value(span);
|
|
match &value {
|
|
Value::Record { val, .. } => {
|
|
let completions = val
|
|
.get("completions")
|
|
.and_then(|val| {
|
|
val.as_list()
|
|
.ok()
|
|
.map(|it| map_value_completions(it.iter(), span, offset))
|
|
})
|
|
.unwrap_or_default();
|
|
let options = val.get("options");
|
|
|
|
if let Some(Value::Record { val: options, .. }) = &options {
|
|
let should_sort = options
|
|
.get("sort")
|
|
.and_then(|val| val.as_bool().ok())
|
|
.unwrap_or(false);
|
|
|
|
if should_sort {
|
|
self.sort_by = SortBy::Ascending;
|
|
}
|
|
|
|
custom_completion_options = Some(CompletionOptions {
|
|
case_sensitive: options
|
|
.get("case_sensitive")
|
|
.and_then(|val| val.as_bool().ok())
|
|
.unwrap_or(true),
|
|
positional: options
|
|
.get("positional")
|
|
.and_then(|val| val.as_bool().ok())
|
|
.unwrap_or(true),
|
|
sort_by: if should_sort {
|
|
SortBy::Ascending
|
|
} else {
|
|
SortBy::None
|
|
},
|
|
match_algorithm: match options.get("completion_algorithm") {
|
|
Some(option) => option
|
|
.as_string()
|
|
.ok()
|
|
.and_then(|option| option.try_into().ok())
|
|
.unwrap_or(MatchAlgorithm::Prefix),
|
|
None => completion_options.match_algorithm,
|
|
},
|
|
});
|
|
}
|
|
|
|
completions
|
|
}
|
|
Value::List { vals, .. } => map_value_completions(vals.iter(), span, offset),
|
|
_ => vec![],
|
|
}
|
|
})
|
|
.unwrap_or_default();
|
|
|
|
if let Some(custom_completion_options) = custom_completion_options {
|
|
filter(&prefix, suggestions, &custom_completion_options)
|
|
} else {
|
|
filter(&prefix, suggestions, completion_options)
|
|
}
|
|
}
|
|
|
|
fn get_sort_by(&self) -> SortBy {
|
|
self.sort_by
|
|
}
|
|
}
|
|
|
|
fn filter(prefix: &[u8], items: Vec<Suggestion>, options: &CompletionOptions) -> Vec<Suggestion> {
|
|
items
|
|
.into_iter()
|
|
.filter(|it| match options.match_algorithm {
|
|
MatchAlgorithm::Prefix => match (options.case_sensitive, options.positional) {
|
|
(true, true) => it.value.as_bytes().starts_with(prefix),
|
|
(true, false) => it.value.contains(std::str::from_utf8(prefix).unwrap_or("")),
|
|
(false, positional) => {
|
|
let value = it.value.to_folded_case();
|
|
let prefix = std::str::from_utf8(prefix).unwrap_or("").to_folded_case();
|
|
if positional {
|
|
value.starts_with(&prefix)
|
|
} else {
|
|
value.contains(&prefix)
|
|
}
|
|
}
|
|
},
|
|
MatchAlgorithm::Fuzzy => options
|
|
.match_algorithm
|
|
.matches_u8(it.value.as_bytes(), prefix),
|
|
})
|
|
.collect()
|
|
}
|