# Description this PR is two-fold - make `use` and `overlay use` use the same completion algorithm in48f29b633
- list directory modules in completions of both with402acde5c
# User-Facing Changes i currently have the following in my `NU_LIB_DIRS` <details> <summary>click to see the script</summary> ```nushell for dir in $env.NU_LIB_DIRS { print $dir print (ls $dir --short-names | select name type) } ``` </details> ``` /home/amtoine/.local/share/nupm/modules #┬────────name────────┬type 0│nu-git-manager │dir 1│nu-git-manager-sugar│dir 2│nu-hooks │dir 3│nu-scripts │dir 4│nu-themes │dir 5│nupm │dir ─┴────────────────────┴──── /home/amtoine/.config/nushell/overlays #┬──name──┬type 0│ocaml.nu│file ─┴────────┴──── ``` > **Note** > all the samples below are run from the Nushell repo, i.e. a directory with a `toolkit.nu` module ## before the changes - `use` would give me `["ocaml.nu", "toolkit.nu"]` - `overlay use` would give me `[]` ## after the changes both commands give me ```nushell [ "nupm/", "ocaml.nu", "toolkit.nu", "nu-scripts/", "nu-git-manager/", "nu-git-manager-sugar/", ] ``` # Tests + Formatting - adds a new `directory_completion/mod.nu` to the completion fixtures - make sure `source-env`, `use` and `overlay-use` are all tested in the _dotnu_ test - fix all the other tests that use completions in the fixtures directory for completions # After Submitting
131 lines
4.5 KiB
Rust
131 lines
4.5 KiB
Rust
use crate::completions::{file_path_completion, Completer, CompletionOptions, SortBy};
|
|
use nu_protocol::{
|
|
engine::{EngineState, StateWorkingSet},
|
|
Span,
|
|
};
|
|
use reedline::Suggestion;
|
|
use std::{
|
|
path::{is_separator, Path, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR},
|
|
sync::Arc,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct DotNuCompletion {
|
|
engine_state: Arc<EngineState>,
|
|
}
|
|
|
|
impl DotNuCompletion {
|
|
pub fn new(engine_state: Arc<EngineState>) -> Self {
|
|
Self { engine_state }
|
|
}
|
|
}
|
|
|
|
impl Completer for DotNuCompletion {
|
|
fn fetch(
|
|
&mut self,
|
|
_: &StateWorkingSet,
|
|
prefix: Vec<u8>,
|
|
span: Span,
|
|
offset: usize,
|
|
_: usize,
|
|
options: &CompletionOptions,
|
|
) -> Vec<Suggestion> {
|
|
let prefix_str = String::from_utf8_lossy(&prefix).replace('`', "");
|
|
let mut search_dirs: Vec<String> = vec![];
|
|
|
|
// If prefix_str is only a word we want to search in the current dir
|
|
let (base, partial) = prefix_str
|
|
.rsplit_once(is_separator)
|
|
.unwrap_or((".", &prefix_str));
|
|
let base_dir = base.replace(is_separator, MAIN_SEPARATOR_STR);
|
|
let mut partial = partial.to_string();
|
|
// On windows, this standardizes paths to use \
|
|
let mut is_current_folder = false;
|
|
|
|
// Fetch the lib dirs
|
|
let lib_dirs: Vec<String> =
|
|
if let Some(lib_dirs) = self.engine_state.get_env_var("NU_LIB_DIRS") {
|
|
lib_dirs
|
|
.as_list()
|
|
.into_iter()
|
|
.flat_map(|it| {
|
|
it.iter().map(|x| {
|
|
x.as_path()
|
|
.expect("internal error: failed to convert lib path")
|
|
})
|
|
})
|
|
.map(|it| {
|
|
it.into_os_string()
|
|
.into_string()
|
|
.expect("internal error: failed to convert OS path")
|
|
})
|
|
.collect()
|
|
} else {
|
|
vec![]
|
|
};
|
|
|
|
// Check if the base_dir is a folder
|
|
// rsplit_once removes the separator
|
|
if base_dir != "." {
|
|
// Add the base dir into the directories to be searched
|
|
search_dirs.push(base_dir.clone());
|
|
|
|
// Reset the partial adding the basic dir back
|
|
// in order to make the span replace work properly
|
|
let mut base_dir_partial = base_dir;
|
|
base_dir_partial.push_str(&partial);
|
|
|
|
partial = base_dir_partial;
|
|
} else {
|
|
// Fetch the current folder
|
|
let current_folder = self.engine_state.current_work_dir();
|
|
is_current_folder = true;
|
|
|
|
// Add the current folder and the lib dirs into the
|
|
// directories to be searched
|
|
search_dirs.push(current_folder);
|
|
search_dirs.extend(lib_dirs);
|
|
}
|
|
|
|
// Fetch the files filtering the ones that ends with .nu
|
|
// and transform them into suggestions
|
|
let output: Vec<Suggestion> = search_dirs
|
|
.into_iter()
|
|
.flat_map(|search_dir| {
|
|
let completions = file_path_completion(span, &partial, &search_dir, options);
|
|
completions
|
|
.into_iter()
|
|
.filter(move |it| {
|
|
// Different base dir, so we list the .nu files or folders
|
|
if !is_current_folder {
|
|
it.1.ends_with(".nu") || it.1.ends_with(SEP)
|
|
} else {
|
|
// Lib dirs, so we filter only the .nu files or directory modules
|
|
if it.1.ends_with(SEP) {
|
|
Path::new(&search_dir).join(&it.1).join("mod.nu").exists()
|
|
} else {
|
|
it.1.ends_with(".nu")
|
|
}
|
|
}
|
|
})
|
|
.map(move |x| Suggestion {
|
|
value: x.1,
|
|
description: None,
|
|
extra: None,
|
|
span: reedline::Span {
|
|
start: x.0.start - offset,
|
|
end: x.0.end - offset,
|
|
},
|
|
append_whitespace: true,
|
|
})
|
|
})
|
|
.collect();
|
|
|
|
output
|
|
}
|
|
|
|
fn get_sort_by(&self) -> SortBy {
|
|
SortBy::LevenshteinDistance
|
|
}
|
|
}
|