From 5879dcfd4c3e467559adc9a7d36e8942a2d8e5f7 Mon Sep 17 00:00:00 2001 From: Riley-Kilgore Date: Wed, 4 Sep 2024 03:35:18 -0700 Subject: [PATCH] Fix import completions --- crates/aiken-lsp/src/server.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/aiken-lsp/src/server.rs b/crates/aiken-lsp/src/server.rs index db35e26a..eafaf185 100644 --- a/crates/aiken-lsp/src/server.rs +++ b/crates/aiken-lsp/src/server.rs @@ -387,8 +387,9 @@ impl Server { match found { // TODO: test - None | Some(Located::Definition(Definition::Use(Use { .. }))) => { - self.completion_for_import() + None => self.completion_for_import(&[]), + Some(Located::Definition(Definition::Use(Use { module, .. }))) => { + self.completion_for_import(module) } // TODO: autocompletion for patterns @@ -408,7 +409,7 @@ impl Server { } } - fn completion_for_import(&self) -> Option> { + fn completion_for_import(&self, module: &[String]) -> Option> { let compiler = self.compiler.as_ref()?; // TODO: Test @@ -421,6 +422,7 @@ impl Server { .into_iter() .chain(project_modules) .sorted() + .filter(|m| m.starts_with(&module.join("/"))) .map(|label| lsp_types::CompletionItem { label, kind: None,