aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authorPascal Kuthe2023-02-07 14:59:04 +0000
committerBlaž Hrastnik2023-03-29 03:57:30 +0000
commit5b3dd6a678ba138ea21d7d5dd8d3c8a53c7a6d3b (patch)
tree038502a6e1d4f7b4a90ac407f3debf00ede211c1 /helix-term/src
parent2d10a429ebf7abe5af184b6227346377dc0523e8 (diff)
implement proper lsp-workspace support
fix typo Co-authored-by: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/application.rs2
-rw-r--r--helix-term/src/commands.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 95faa01b..4d903eec 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1018,7 +1018,7 @@ impl Application {
let language_server =
self.editor.language_servers.get_by_id(server_id).unwrap();
- Ok(json!(language_server.workspace_folders()))
+ Ok(json!(&*language_server.workspace_folders().await))
}
Ok(MethodCall::WorkspaceConfiguration(params)) => {
let result: Vec<_> = params
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e4d0d753..0f53fdc9 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2419,7 +2419,7 @@ fn append_mode(cx: &mut Context) {
}
fn file_picker(cx: &mut Context) {
- let root = find_workspace();
+ let root = find_workspace().0;
let picker = ui::file_picker(root, &cx.editor.config());
cx.push_layer(Box::new(overlayed(picker)));
}