extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-23 23:00:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix completion duplicates (#964)

Browse Source
This commit is contained in:
JT 2022-02-06 16:33:33 -05:00 committed by GitHub
parent 796b7a1962
commit de4449c3ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
crates/nu-cli/src/completions.rs
View File

@ -134,41 +134,8 @@ impl NuCompleter {
) )
}); });
results.collect()
}
fn complete_filepath_and_commands(
&self,
working_set: &StateWorkingSet,
span: Span,
offset: usize,
) -> Vec<(reedline::Span, String)> {
let results = self.complete_commands(working_set, span, offset);
let prefix = working_set.get_span_contents(span); let prefix = working_set.get_span_contents(span);
let cwd = if let Some(d) = self.engine_state.env_vars.get("PWD") {
match d.as_string() {
Ok(s) => s,
Err(_) => "".to_string(),
}
} else {
"".to_string()
};
let prefix = String::from_utf8_lossy(prefix).to_string(); let prefix = String::from_utf8_lossy(prefix).to_string();
let results_paths = file_path_completion(span, &prefix, &cwd)
.into_iter()
.map(move |x| {
(
reedline::Span {
start: x.0.start - offset,
end: x.0.end - offset,
},
x.1,
)
});
let results_external = let results_external =
self.external_command_completion(&prefix) self.external_command_completion(&prefix)
.into_iter() .into_iter()
@ -184,7 +151,6 @@ impl NuCompleter {
results results
.into_iter() .into_iter()
.chain(results_paths.into_iter())
.chain(results_external.into_iter()) .chain(results_external.into_iter())
.collect() .collect()
} }
@ -291,13 +257,29 @@ impl NuCompleter {
offset, offset,
); );
return self let cwd = if let Some(d) = self.engine_state.env_vars.get("PWD")
.complete_filepath_and_commands( {
&working_set, match d.as_string() {
flat.0, Ok(s) => s,
offset, Err(_) => "".to_string(),
) }
} else {
"".to_string()
};
let prefix = working_set.get_span_contents(flat.0);
let prefix = String::from_utf8_lossy(prefix).to_string();
return file_path_completion(flat.0, &prefix, &cwd)
.into_iter() .into_iter()
.map(move |x| {
(
reedline::Span {
start: x.0.start - offset,
end: x.0.end - offset,
},
x.1,
)
})
.chain(subcommands.into_iter()) .chain(subcommands.into_iter())
.collect(); .collect();
} }