Implemented a recursive visitor that checks each occurrence of a symbol for renaming

Author: halirutan

Mathematica-IntelliJ-Plugin.iml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" manifest="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />

resources/META-INF/plugin.xml

@@ -168,6 +168,7 @@
     <psi.referenceContributor language="Mathematica" implementation="de.halirutan.mathematica.parsing.psi.MathematicaReferenceContributor"/>
     <renamePsiElementProcessor implementation="de.halirutan.mathematica.refactoring.MathematicaPsiRenameProcessor"/>
 
+
     <!--<applicationService serviceInterface="de.halirutan.mathematica.MathematicaSettings" serviceImplementation="de.halirutan.mathematica.MathematicaSettings"/>-->
     <!--<applicationConfigurable groupId="language" displayName="Mathematica" id="preferences.Mathematica"-->
                              <!--instance="de.halirutan.mathematica.MathematicaSettingsConfigurable"/>-->

src/de/halirutan/mathematica/refactoring/MathematicaPsiRenameProcessor.java

@@ -23,19 +23,25 @@
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.rename.RenamePsiElementProcessor;
+import de.halirutan.mathematica.parsing.psi.MathematicaRecursiveVisitor;
 import de.halirutan.mathematica.parsing.psi.api.Symbol;
 import de.halirutan.mathematica.parsing.psi.api.string.MString;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Objects;
 
-/** This class shouldn't be necessary since usually Idea does a great job of renaming if you have
+/**
+ * This class shouldn't be necessary since usually Idea does a great job of renaming if you have
  * your symbol references working correctly. Unfortunately there is a bug that was introduces by some
  * optimisation {@see https://youtrack.jetbrains.com/issue/IDEA-165760}.
- *
+ * <p>
  * Therefore, this class just adds some references that were missed by Idea. This will be removed as soon
  * as the bug is fixed.
+ *
  * @author patrick (24.12.16).
  */
 public class MathematicaPsiRenameProcessor extends RenamePsiElementProcessor {
@@ -48,13 +54,40 @@ public boolean canProcessElement(@NotNull PsiElement element) {
   @Override
   public Collection<PsiReference> findReferences(PsiElement element) {
     final Collection<PsiReference> references = super.findReferences(element);
-    final PsiReference[] myReferences = element.getReferences();
-    for (PsiReference ref : myReferences) {
-      if (!references.contains(ref)) {
-        references.add(ref);
+    PsiReference elementRef = element.getReference();
+    PsiElement definitionElement;
+    if (elementRef != null) {
+      definitionElement = elementRef.resolve();
+      if (definitionElement instanceof Symbol) {
+        SymbolCollector collector = new SymbolCollector((Symbol) definitionElement);
+        element.getContainingFile().accept(collector);
+        references.addAll(collector.myReferences);
       }
     }
     return references;
   }
 
+  private class SymbolCollector extends MathematicaRecursiveVisitor {
+    Collection<PsiReference> myReferences;
+    Symbol myDefinitionElement;
+
+    SymbolCollector(Symbol definitionElement) {
+      this.myDefinitionElement = definitionElement;
+      myReferences = new HashSet<>();
+    }
+
+    @Override
+    public void visitSymbol(Symbol symbol) {
+      if (symbol.getSymbolName().equals(myDefinitionElement.getSymbolName())) {
+        PsiReference reference = symbol.getReference();
+        if (reference != null) {
+          PsiElement resolve = reference.resolve();
+          if (resolve != null && resolve.equals(myDefinitionElement)) {
+            myReferences.add(reference);
+          }
+        }
+      }
+    }
+  }
+
 }