holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nu-cli: external completer precedence before file (#6652)

Browse Source
This commit is contained in:
rsteube 2022-10-01 14:24:22 +02:00 committed by GitHub
parent 5959d1366a
commit e629ef203a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/nu-cli/src/completions/completer.rs
View File

@ -60,10 +60,10 @@ impl NuCompleter {
fn external_completion(
&self,
block_id: BlockId,
spans: Vec<String>,
spans: &[String],
offset: usize,
span: Span,
) -> Vec<Suggestion> {
) -> Option<Vec<Suggestion>> {
let stack = self.stack.clone();
let block = self.engine_state.get_block(block_id);
let mut callee_stack = stack.gather_captures(&block.captures);
@ -75,9 +75,9 @@ impl NuCompleter {
var_id,
Value::List {
vals: spans
.into_iter()
.iter()
.map(|it| Value::String {
val: it,
val: it.to_string(),
span: Span::unknown(),
})
.collect(),
@ -109,13 +109,13 @@ impl NuCompleter {
offset,
);
return result;
return Some(result);
}
}
Err(err) => println!("failed to eval completer block: {}", err),
}
vec![]
None
}
fn completion_helper(&mut self, line: &str, pos: usize) -> Vec<Suggestion> {
@ -213,7 +213,11 @@ impl NuCompleter {
// We got no results for internal completion
// now we can check if external completer is set and use it
if let Some(block_id) = config.external_completer {
return self.external_completion(block_id, spans, offset, new_span);
if let Some(external_result) =
self.external_completion(block_id, &spans, offset, new_span)
{
return external_result;
}
}
}
@ -340,6 +344,15 @@ impl NuCompleter {
return out;
}
// Try to complete using an external completer (if set)
if let Some(block_id) = config.external_completer {
if let Some(external_result) =
self.external_completion(block_id, &spans, offset, new_span)
{
return external_result;
}
}
// Check for file completion
let mut completer = FileCompletion::new(self.engine_state.clone());
out = self.process_completion(
@ -354,12 +367,6 @@ impl NuCompleter {
if !out.is_empty() {
return out;
}
// Try to complete using an exnternal compelter (if set)
if let Some(block_id) = config.external_completer {
return self
.external_completion(block_id, spans, offset, new_span);
}
}
};
}