extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-10-07 02:44:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for multiline rustyline edits (#2456)

Browse Source 
* Add support for multiline rustyline edits

* clippy
This commit is contained in:
Jonathan Turner 2020-08-30 20:00:28 +12:00 committed by GitHub
parent df691c6c91
commit c897ac6e1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
crates/nu-cli/src/shell/helper.rs
View File

@ -15,6 +15,7 @@ pub struct Helper {
hinter: Option<rustyline::hint::HistoryHinter>,
context: Context,
pub colored_prompt: String,
validator: NuValidator,
}
impl Helper {
@ -24,6 +25,7 @@ impl Helper {
hinter,
context,
colored_prompt: String::new(),
validator: NuValidator {},
}
}
}
@ -90,6 +92,40 @@ impl rustyline::highlight::Highlighter for Helper {
}
}
impl rustyline::validate::Validator for Helper {
fn validate(
&self,
ctx: &mut rustyline::validate::ValidationContext,
) -> rustyline::Result<rustyline::validate::ValidationResult> {
self.validator.validate(ctx)
}
fn validate_while_typing(&self) -> bool {
self.validator.validate_while_typing()
}
}
struct NuValidator {}
impl rustyline::validate::Validator for NuValidator {
fn validate(
&self,
ctx: &mut rustyline::validate::ValidationContext,
) -> rustyline::Result<rustyline::validate::ValidationResult> {
let src = ctx.input();
let lite_result = nu_parser::lite_parse(src, 0);
if let Err(err) = lite_result {
if let nu_errors::ParseErrorReason::Eof { .. } = err.cause.reason() {
return Ok(rustyline::validate::ValidationResult::Incomplete);
}
}
Ok(rustyline::validate::ValidationResult::Valid(None))
}
}
#[allow(unused)]
fn vec_tag<T>(input: Vec<Tagged<T>>) -> Option<Tag> {
let mut iter = input.iter();
@ -189,7 +225,3 @@ impl Painter {
}
impl rustyline::Helper for Helper {}
// Use default validator for normal single line behaviour
// In the future we can implement this for custom multi-line support
impl rustyline::validate::Validator for Helper {}