This PR reverts https://github.com/nushell/nushell/pull/9391 We try not to revert PRs like this, though after discussion with the Nushell team, we decided to revert this one. The main reason is that Nushell, as a codebase, isn't ready for these kinds of optimisations. It's in the part of the development cycle where our main focus should be on improving the algorithms inside of Nushell itself. Once we have matured our algorithms, then we can look for opportunities to switch out technologies we're using for alternate forms. Much of Nushell still has lots of opportunities for tuning the codebase, paying down technical debt, and making the codebase generally cleaner and more robust. This should be the focus. Performance improvements should flow out of that work. Said another, optimisation that isn't part of tuning the codebase is premature at this stage. We need to focus on doing the hard work of making the engine, parser, etc better. # User-Facing Changes Reverts the HashMap -> ahash change. cc @FilipAndersson245
174 lines
6.3 KiB
Rust
174 lines
6.3 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 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 { .. } => {
|
|
let completions = value
|
|
.get_data_by_key("completions")
|
|
.and_then(|val| {
|
|
val.as_list()
|
|
.ok()
|
|
.map(|it| map_value_completions(it.iter(), span, offset))
|
|
})
|
|
.unwrap_or_default();
|
|
let options = value.get_data_by_key("options");
|
|
|
|
if let Some(Value::Record { .. }) = &options {
|
|
let options = options.unwrap_or_default();
|
|
let should_sort = options
|
|
.get_data_by_key("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_data_by_key("case_sensitive")
|
|
.and_then(|val| val.as_bool().ok())
|
|
.unwrap_or(true),
|
|
positional: options
|
|
.get_data_by_key("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_data_by_key("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_lowercase();
|
|
let prefix = std::str::from_utf8(prefix).unwrap_or("").to_lowercase();
|
|
if positional {
|
|
value.starts_with(&prefix)
|
|
} else {
|
|
value.contains(&prefix)
|
|
}
|
|
}
|
|
},
|
|
MatchAlgorithm::Fuzzy => options
|
|
.match_algorithm
|
|
.matches_u8(it.value.as_bytes(), prefix),
|
|
})
|
|
.collect()
|
|
}
|