diff --git a/Cargo.lock b/Cargo.lock index f326d8cbfd..79c4de805b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3716,7 +3716,7 @@ dependencies = [ [[package]] name = "reedline" version = "0.4.0" -source = "git+https://github.com/nushell/reedline?branch=main#2947a94fefac63e8fba2076327bae373f8d09b9d" +source = "git+https://github.com/nushell/reedline?branch=main#29f30a8f7926ad5cded3be564b6c26679c10e1c5" dependencies = [ "chrono", "crossterm", diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs index bcd3360220..76113d8aaa 100644 --- a/crates/nu-cli/src/completions/command_completions.rs +++ b/crates/nu-cli/src/completions/command_completions.rs @@ -98,6 +98,7 @@ impl CommandCompletion { start: span.start - offset, end: span.end - offset, }, + append_whitespace: true, }); let results_aliases = working_set @@ -111,6 +112,7 @@ impl CommandCompletion { start: span.start - offset, end: span.end - offset, }, + append_whitespace: true, }); let mut results = results.chain(results_aliases).collect::>(); @@ -129,6 +131,7 @@ impl CommandCompletion { start: span.start - offset, end: span.end - offset, }, + append_whitespace: true, }); for external in results_external { @@ -138,6 +141,7 @@ impl CommandCompletion { description: None, extra: None, span: external.span, + append_whitespace: true, }) } else { results.push(external) @@ -267,6 +271,7 @@ impl Completer for CommandCompletion { start: x.0.start - offset, end: x.0.end - offset, }, + append_whitespace: false, }) .chain(subcommands.into_iter()) .chain(commands.into_iter()) diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs index b8e7f1d085..349fa4fe00 100644 --- a/crates/nu-cli/src/completions/custom_completions.rs +++ b/crates/nu-cli/src/completions/custom_completions.rs @@ -44,6 +44,7 @@ impl CustomCompletion { start: span.start - offset, end: span.end - offset, }, + append_whitespace: false, }); } @@ -57,6 +58,7 @@ impl CustomCompletion { start: span.start - offset, end: span.end - offset, }, + append_whitespace: false, }; // Iterate the cols looking for `value` and `description` diff --git a/crates/nu-cli/src/completions/directory_completions.rs b/crates/nu-cli/src/completions/directory_completions.rs index 8f18dea755..0156132d07 100644 --- a/crates/nu-cli/src/completions/directory_completions.rs +++ b/crates/nu-cli/src/completions/directory_completions.rs @@ -53,6 +53,7 @@ impl Completer for DirectoryCompletion { start: x.0.start - offset, end: x.0.end - offset, }, + append_whitespace: false, }); } diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs index 527bfc818e..7907b2252a 100644 --- a/crates/nu-cli/src/completions/dotnu_completions.rs +++ b/crates/nu-cli/src/completions/dotnu_completions.rs @@ -110,6 +110,7 @@ impl Completer for DotNuCompletion { start: x.0.start - offset, end: x.0.end - offset, }, + append_whitespace: true, }) }) .collect(); diff --git a/crates/nu-cli/src/completions/file_completions.rs b/crates/nu-cli/src/completions/file_completions.rs index ad38d70c6b..bc41b50bfd 100644 --- a/crates/nu-cli/src/completions/file_completions.rs +++ b/crates/nu-cli/src/completions/file_completions.rs @@ -49,6 +49,7 @@ impl Completer for FileCompletion { start: x.0.start - offset, end: x.0.end - offset, }, + append_whitespace: false, }) .collect(); diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs index 6344c7654c..08f6bcd5ef 100644 --- a/crates/nu-cli/src/completions/flag_completions.rs +++ b/crates/nu-cli/src/completions/flag_completions.rs @@ -51,6 +51,7 @@ impl Completer for FlagCompletion { start: span.start - offset, end: span.end - offset, }, + append_whitespace: true, }); } } @@ -72,6 +73,7 @@ impl Completer for FlagCompletion { start: span.start - offset, end: span.end - offset, }, + append_whitespace: true, }); } } diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs index 59d67d2cbc..5372b39af5 100644 --- a/crates/nu-cli/src/completions/variable_completions.rs +++ b/crates/nu-cli/src/completions/variable_completions.rs @@ -84,6 +84,7 @@ impl Completer for VariableCompletion { description: None, extra: None, span: current_span, + append_whitespace: false, }); } } @@ -137,6 +138,7 @@ impl Completer for VariableCompletion { description: None, extra: None, span: current_span, + append_whitespace: false, }); } } @@ -150,6 +152,7 @@ impl Completer for VariableCompletion { description: None, extra: None, span: current_span, + append_whitespace: false, }); } } @@ -164,6 +167,7 @@ impl Completer for VariableCompletion { description: None, extra: None, span: current_span, + append_whitespace: false, }); } } @@ -198,6 +202,7 @@ fn nested_suggestions( description: None, extra: None, span: current_span, + append_whitespace: false, }); } diff --git a/crates/nu-cli/src/menus/help_completions.rs b/crates/nu-cli/src/menus/help_completions.rs index 08428e612c..12ad18fd96 100644 --- a/crates/nu-cli/src/menus/help_completions.rs +++ b/crates/nu-cli/src/menus/help_completions.rs @@ -92,6 +92,7 @@ impl NuHelpCompleter { start: pos, end: pos + line.len(), }, + append_whitespace: false, } }) .collect() diff --git a/crates/nu-cli/src/menus/menu_completions.rs b/crates/nu-cli/src/menus/menu_completions.rs index 96de1823d6..411e474e65 100644 --- a/crates/nu-cli/src/menus/menu_completions.rs +++ b/crates/nu-cli/src/menus/menu_completions.rs @@ -155,6 +155,7 @@ fn convert_to_suggestions( description, extra, span, + append_whitespace: false, }] } Value::List { vals, .. } => vals @@ -169,6 +170,7 @@ fn convert_to_suggestions( start: 0, end: line.len(), }, + append_whitespace: false, }], } }