feat: lsp find references

kcl-lang · Sep 19, 2023 · 367dc7a · 367dc7a
1 parent 9286e95
commit 367dc7a
Show file tree

Hide file tree

Showing 25 changed files with 345 additions and 610 deletions.
diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock
diff --git a/kclvm/parser/src/lib.rs b/kclvm/parser/src/lib.rs
@@ -313,7 +313,7 @@ impl Loader {
     fn _load_main(&mut self) -> Result<ast::Program, String> {
         let compile_entries = get_compile_entries_from_paths(&self.paths, &self.opts)?;
         let mut pkgs = HashMap::new();
-        let workdir = compile_entries.get_root_path().to_string();
+        let workdir = compile_entries.get_root_path().to_string();// get package root
 
         debug_assert_eq!(compile_entries.len(), self.paths.len());
 

diff --git a/kclvm/tools/src/LSP/src/completion.rs b/kclvm/tools/src/LSP/src/completion.rs
@@ -83,7 +83,7 @@ fn completion_attr(
     if let Some((node, schema_expr)) = is_in_schema(program, pos) {
         let schema_def = find_def(node, &schema_expr.name.get_end_pos(), prog_scope);
         if let Some(schema) = schema_def {
-            if let Definition::Object(obj) = schema {
+            if let Definition::Object(obj, _) = schema {
                 let schema_type = obj.ty.into_schema_type();
                 completions.extend(schema_type.attrs.keys().map(|attr| KCLCompletionItem {
                     label: attr.clone(),
@@ -171,7 +171,7 @@ pub(crate) fn get_completion(
                     let def = find_def(stmt, pos, prog_scope);
                     if let Some(def) = def {
                         match def {
-                            crate::goto_def::Definition::Object(obj) => {
+                            crate::goto_def::Definition::Object(obj, _) => {
                                 match &obj.ty.kind {
                                     // builtin (str) functions
                                     kclvm_sema::ty::TypeKind::Str => {
@@ -219,7 +219,7 @@ pub(crate) fn get_completion(
                                     _ => {}
                                 }
                             }
-                            crate::goto_def::Definition::Scope(s) => {
+                            crate::goto_def::Definition::Scope(s, _) => {
                                 for (name, obj) in &s.elems {
                                     if let ScopeObjectKind::Module(_) = obj.borrow().kind {
                                         continue;
@@ -252,7 +252,7 @@ pub(crate) fn get_completion(
                                 find_def(stmt, &schema_expr.name.get_end_pos(), prog_scope);
                             if let Some(schema) = schema_def {
                                 match schema {
-                                    Definition::Object(obj) => {
+                                    Definition::Object(obj, _) => {
                                         let schema_type = obj.ty.into_schema_type();
                                         items.extend(
                                             schema_type
@@ -264,7 +264,7 @@ pub(crate) fn get_completion(
                                                 .collect::<IndexSet<KCLCompletionItem>>(),
                                         );
                                     }
-                                    Definition::Scope(_) => {}
+                                    Definition::Scope(_, _) => {}
                                 }
                             }
                         }

diff --git a/kclvm/tools/src/LSP/src/find_ref/find_refs.rs b/kclvm/tools/src/LSP/src/find_ref/find_refs.rs
diff --git a/kclvm/tools/src/LSP/src/find_ref/go_to_def.rs b/kclvm/tools/src/LSP/src/find_ref/go_to_def.rs
diff --git a/kclvm/tools/src/LSP/src/find_ref/mod.rs b/kclvm/tools/src/LSP/src/find_ref/mod.rs
diff --git a/kclvm/tools/src/LSP/src/find_ref/test_data/inherit.k b/kclvm/tools/src/LSP/src/find_ref/test_data/inherit.k
diff --git a/kclvm/tools/src/LSP/src/find_ref/test_data/inherit_pkg.k b/kclvm/tools/src/LSP/src/find_ref/test_data/inherit_pkg.k
diff --git a/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace/inherit.k b/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace/inherit.k
diff --git a/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace/inherit_pkg.k b/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace/inherit_pkg.k
diff --git a/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace_map/inherit.k b/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace_map/inherit.k
diff --git a/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace_map/inherit_pkg.k b/kclvm/tools/src/LSP/src/find_ref/test_data/test_word_workspace_map/inherit_pkg.k