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

More bug fixes for completions (#2476)

Browse Source 
* Use the cursor position for the span when between locations.

This fixes a bug where completing

    ls <TAB>

would result in replacing the entire line.

* Revert to the default update implementation.

Replacing the length of the elected value was intended to do replacement when
one moves inside a quote. The problem is that a long elected suggestion could
replace bits of a pipeline that are after the cursor. For example:

    ls <TAB> | get name | str collect
This commit is contained in:
Jason Gedge 2020-09-01 00:10:46 -04:00 committed by GitHub
parent 6b5d96337e
commit 860c2a606d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-cli/src/completion/engine.rs
View File

@ -232,10 +232,10 @@ pub fn completion_location(line: &str, block: &Block, pos: usize) -> Vec<Complet
// is after some character that would imply we're in the command position. // is after some character that would imply we're in the command position.
let start = prev.span.end(); let start = prev.span.end();
if line[start..pos].contains(BEFORE_COMMAND_CHARS) { if line[start..pos].contains(BEFORE_COMMAND_CHARS) {
vec![LocationType::Command.spanned(Span::unknown())] vec![LocationType::Command.spanned(Span::new(pos, pos))]
} else { } else {
// TODO this should be able to be mapped to a command // TODO this should be able to be mapped to a command
vec![LocationType::Argument(command, None).spanned(Span::unknown())] vec![LocationType::Argument(command, None).spanned(Span::new(pos, pos))]
} }
} else { } else {
// Cursor is before any possible completion location, so must be a command // Cursor is before any possible completion location, so must be a command

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

@ -54,7 +54,7 @@ impl rustyline::completion::Completer for Helper {
} }
fn update(&self, line: &mut rustyline::line_buffer::LineBuffer, start: usize, elected: &str) { fn update(&self, line: &mut rustyline::line_buffer::LineBuffer, start: usize, elected: &str) {
let end = (start + elected.len()).min(line.len()); let end = line.pos();
line.replace(start..end, elected) line.replace(start..end, elected)
} }
} }