Search for references only in the current file

VHDL-LS · Jun 4, 2024 · 1268dab · 1268dab
1 parent e073ac0
commit 1268dab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/vhdl_lang/src/analysis/root.rs b/vhdl_lang/src/analysis/root.rs
@@ -520,6 +520,12 @@ impl DesignRoot {
         searcher.references
     }
 
+    pub fn find_all_references_in_source(&self, source: &Source, ent: EntRef) -> Vec<SrcPos> {
+        let mut searcher = FindAllReferences::new(self, ent);
+        let _ = self.search_source(source, &mut searcher);
+        searcher.references
+    }
+
     pub fn public_symbols<'a>(&'a self) -> Box<dyn Iterator<Item = EntRef<'a>> + 'a> {
         Box::new(self.libraries.values().flat_map(|library| {
             std::iter::once(self.arenas.get(library.id)).chain(library.units.values().flat_map(

diff --git a/vhdl_lang/src/project.rs b/vhdl_lang/src/project.rs
@@ -309,6 +309,10 @@ impl Project {
         self.root.find_all_references(ent)
     }
 
+    pub fn find_all_references_in_source(&self, source: &Source, ent: &AnyEnt) -> Vec<SrcPos> {
+        self.root.find_all_references_in_source(source, ent)
+    }
+
     /// Get source positions that are not resolved to a declaration
     /// This is used for development to test where the language server is blind
     pub fn find_all_unresolved(&self) -> (usize, Vec<SrcPos>) {

diff --git a/vhdl_ls/src/vhdl_server.rs b/vhdl_ls/src/vhdl_server.rs
@@ -696,17 +696,11 @@ impl VHDLServer {
 
         Some(
             self.project
-                .find_all_references(ent)
+                .find_all_references_in_source(&source, ent)
                 .iter()
-                .filter_map(|pos| {
-                    if pos.source == source {
-                        Some(DocumentHighlight {
-                            range: to_lsp_range(pos.range()),
-                            kind: Some(DocumentHighlightKind::TEXT),
-                        })
-                    } else {
-                        None
-                    }
+                .map(|pos| DocumentHighlight {
+                    range: to_lsp_range(pos.range()),
+                    kind: Some(DocumentHighlightKind::TEXT),
                 })
                 .collect(),
         )