use the same interface for finding references everywhere

Author: giacomocavalieri

compiler-core/src/language_server/code_action.rs

@@ -36,7 +36,7 @@ use super::{
     edits::{add_newlines_after_import, get_import_edit, position_of_first_definition_if_import},
     engine::{overlaps, within},
     files::FileSystemProxy,
-    reference::{VariableReferenceKind, find_variable_references},
+    reference::VariableReferenceKind,
     src_span_to_lsp_range, url_from_path,
 };
 
@@ -5947,7 +5947,8 @@ impl<'a> InlineVariable<'a> {
     }
 
     fn maybe_inline(&mut self, location: SrcSpan, name: EcoString) {
-        let references = find_variable_references(&self.module.ast, location, name);
+        let references =
+            FindVariableReferences::new(location, name).find_in_module(&self.module.ast);
         let reference = if references.len() == 1 {
             references
                 .into_iter()

compiler-core/src/language_server/engine.rs

@@ -16,6 +16,7 @@ use crate::{
         compiler::LspProjectCompiler,
         files::FileSystemProxy,
         progress::ProgressReporter,
+        reference::FindVariableReferences,
     },
     line_numbers::LineNumbers,
     paths::ProjectPaths,
@@ -53,8 +54,7 @@ use super::{
     },
     completer::Completer,
     reference::{
-        Referenced, VariableReferenceKind, find_module_references, find_variable_references,
-        reference_for_ast_node,
+        Referenced, VariableReferenceKind, find_module_references, reference_for_ast_node,
     },
     rename::{RenameTarget, Renamed, rename_local_variable, rename_module_entity},
     signature_help, src_span_to_lsp_range,
@@ -803,7 +803,8 @@ where
                     )
                     | None => {
                         let variable_references =
-                            find_variable_references(&module.ast, definition_location, name);
+                            FindVariableReferences::new(definition_location, name)
+                                .find_in_module(&module.ast);
 
                         let mut reference_locations =
                             Vec::with_capacity(variable_references.len() + 1);

compiler-core/src/language_server/reference.rs

@@ -354,21 +354,6 @@ pub enum VariableReferenceKind {
     LabelShorthand,
 }
 
-pub fn find_variable_references(
-    module: &TypedModule,
-    definition_location: SrcSpan,
-    name: EcoString,
-) -> HashSet<VariableReference> {
-    let mut finder = FindVariableReferences {
-        references: HashSet::new(),
-        definition_location,
-        alternative_variable: AlternativeVariable::Ignore,
-        name,
-    };
-    finder.visit_typed_module(module);
-    finder.references
-}
-
 /// How to treat variables defined in alternative patterns
 enum AlternativeVariable {
     Track,

compiler-core/src/language_server/rename.rs

@@ -7,19 +7,19 @@ use crate::{
     analyse::name,
     ast::{self, Definition, SrcSpan},
     build::Module,
-    language_server::edits::{
-        self, Newlines, add_newlines_after_import, position_of_first_definition_if_import,
+    language_server::{
+        edits::{
+            self, Newlines, add_newlines_after_import, position_of_first_definition_if_import,
+        },
+        reference::FindVariableReferences,
     },
     line_numbers::LineNumbers,
     reference::ReferenceKind,
     type_::{ModuleInterface, error::Named},
 };
 
 use super::{
-    TextEdits,
-    compiler::ModuleSourceInformation,
-    reference::{VariableReferenceKind, find_variable_references},
-    url_from_path,
+    TextEdits, compiler::ModuleSourceInformation, reference::VariableReferenceKind, url_from_path,
 };
 
 fn workspace_edit(uri: Url, edits: Vec<TextEdit>) -> WorkspaceEdit {
@@ -54,7 +54,8 @@ pub fn rename_local_variable(
     let uri = params.text_document_position.text_document.uri.clone();
     let mut edits = TextEdits::new(line_numbers);
 
-    let references = find_variable_references(&module.ast, definition_location, name);
+    let references =
+        FindVariableReferences::new(definition_location, name).find_in_module(&module.ast);
 
     match kind {
         VariableReferenceKind::Variable => {