Finish up completions

This commit is contained in:
JT
2021-09-10 10:09:40 +12:00
parent f7333ebe58
commit abda6f148c
5 changed files with 97 additions and 43 deletions

View File

@ -1,14 +1,12 @@
use std::{cell::RefCell, rc::Rc};
use nu_cli::{report_parsing_error, report_shell_error, NuHighlighter};
use nu_cli::{report_parsing_error, report_shell_error, NuCompleter, NuHighlighter};
use nu_command::create_default_context;
use nu_engine::eval_block;
use nu_parser::{flatten_block, parse};
use nu_parser::parse;
use nu_protocol::{
engine::{EngineState, EvaluationContext, StateWorkingSet},
Value,
};
use reedline::{Completer, DefaultCompletionActionHandler};
use reedline::DefaultCompletionActionHandler;
#[cfg(test)]
mod tests;
@ -56,9 +54,7 @@ fn main() -> std::io::Result<()> {
} else {
use reedline::{DefaultPrompt, FileBackedHistory, Reedline, Signal};
let completer = EQCompleter {
engine_state: engine_state.clone(),
};
let completer = NuCompleter::new(engine_state.clone());
let mut line_editor = Reedline::create()?
.with_history(Box::new(FileBackedHistory::with_file(
@ -153,38 +149,3 @@ fn main() -> std::io::Result<()> {
Ok(())
}
}
struct EQCompleter {
engine_state: Rc<RefCell<EngineState>>,
}
impl Completer for EQCompleter {
fn complete(&self, line: &str, pos: usize) -> Vec<(reedline::Span, String)> {
let engine_state = self.engine_state.borrow();
let mut working_set = StateWorkingSet::new(&*engine_state);
let offset = working_set.next_span_start();
let pos = offset + pos;
let (output, _err) = parse(&mut working_set, Some("completer"), line.as_bytes(), false);
let flattened = flatten_block(&working_set, &output);
for flat in flattened {
if pos >= flat.0.start && pos <= flat.0.end {
match flat.1 {
nu_parser::FlatShape::External | nu_parser::FlatShape::InternalCall => {
return vec![(
reedline::Span {
start: flat.0.start - offset,
end: flat.0.end - offset,
},
"hello".into(),
)]
}
_ => {}
}
}
}
vec![]
}
}