extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-15 00:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): more accurate PWD: from env -> parent dir of current file (#15470)

Browse Source 
# Description

Some editors like neovim will provide "workspace root" as PWD, which can
mess up file completion results.

# User-Facing Changes

bug fix

# Tests + Formatting

adjusted

# After Submitting
This commit is contained in:
zc he
2025-04-05 21:41:34 +08:00
committed by GitHub
parent 0cd90e2388
commit 210c6f1c43
10 changed files with 110 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-lsp/src/completion.rs
View File

@ -29,7 +29,7 @@ impl LanguageServer {
.is_some_and(|c| c.is_whitespace() || "|(){}[]<>,:;".contains(c));
self.need_parse |= need_fallback;
let engine_state = Arc::new(self.new_engine_state());
let engine_state = Arc::new(self.new_engine_state(Some(&path_uri)));
let completer = NuCompleter::new(engine_state.clone(), Arc::new(Stack::new()));
let results = if need_fallback {
completer.fetch_completions_at(&file_text[..location], location)
@ -264,10 +264,10 @@ mod tests {
let resp = send_complete_request(&client_connection, script.clone(), 2, 18);
assert!(result_from_message(resp).as_array().unwrap().contains(
&serde_json::json!({
"label": "LICENSE",
"label": "command.nu",
"labelDetails": { "description": "" },
"textEdit": { "range": { "start": { "line": 2, "character": 17 }, "end": { "line": 2, "character": 18 }, },
"newText": "LICENSE"
"newText": "command.nu"
},
"kind": 17
})
@ -337,10 +337,10 @@ mod tests {
let resp = send_complete_request(&client_connection, script, 5, 4);
assert!(result_from_message(resp).as_array().unwrap().contains(
&serde_json::json!({
"label": "LICENSE",
"label": "cell_path.nu",
"labelDetails": { "description": "" },
"textEdit": { "range": { "start": { "line": 5, "character": 3 }, "end": { "line": 5, "character": 4 }, },
"newText": "LICENSE"
"newText": "cell_path.nu"
},
"kind": 17
})