Fix for resolve bug in patterns

In a construct like {a_, a_} :> a_ the second a did not refer to the first
a which it should. All "a" should have one single symbol they refer to.

Author: halirutan

src/de/halirutan/mathematica/lang/psi/impl/SymbolImpl.java

@@ -25,7 +25,10 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.PsiFileFactory;
+import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.ResolveCache;
 import com.intellij.util.IncorrectOperationException;
 import de.halirutan.mathematica.file.MathematicaFileType;
@@ -212,27 +215,9 @@ public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOpe
     return null;
   }
 
-  /**
-   * This method is used by {@link PsiManager#areElementsEquivalent(PsiElement, PsiElement)}
-   * @param another the other element which is tested to be equal to this element
-   * @return true if the full symbol name is the same.
-   */
-  @Override
-  public boolean isEquivalentTo(PsiElement another) {
-    if (super.isEquivalentTo(another)) {
-      return true;
-    }
-    if (another instanceof PsiReference) {
-      final PsiElement myDef = resolve();
-      final PsiElement otherDef = ((PsiReference) another).resolve();
-      return myDef != null && otherDef != null && myDef == otherDef;
-    }
-    return false;
-  }
-
   @Override
   public boolean isReferenceTo(PsiElement element) {
-    return getManager().areElementsEquivalent(resolve(), element);
+    return (element instanceof Symbol || element instanceof LightSymbol) && getManager().areElementsEquivalent(resolve(), element);
   }
 
   @NotNull

src/de/halirutan/mathematica/lang/psi/util/PatternSymbolExtractor.kt

@@ -41,7 +41,7 @@ import de.halirutan.mathematica.lang.psi.api.pattern.Pattern
  */
 class PatternSymbolExtractor : MathematicaVisitor() {
 
-  val patternSymbols = HashSet<Symbol>()
+  val patternSymbols = ArrayList<Symbol>()
   /* Except | Longest | Optional | PatternTest | Repeated | RepeatedNull | Shortest
 * HoldPattern | IgnoringInactive | KeyValuePattern | Literal | Longest | Optional | Repeated | RepeatedNull | Shortest
 * */

tests/de/halirutan/mathematica/MathematicaLexerTest.java

@@ -35,7 +35,7 @@ protected Lexer createLexer() {
     return new MathematicaLexer();
   }
 
-  public void testSlots1() throws Exception {
+  public void testSlots1() {
     doTest("#[#Test&, #\"Test\"&]&;",
         "SLOT ('#')\n" +
             "LEFT_BRACKET ('[')\n" +
@@ -50,7 +50,7 @@ public void testSlots1() throws Exception {
             "SEMICOLON (';')");
   }
 
-  public void testNumbers() throws Exception {
+  public void testNumbers() {
     doTest("1", "NUMBER ('1')");
     doTest("1.0", "NUMBER ('1.0')");
     doTest("16^^abc", "NUMBER ('16^^abc')");
@@ -62,7 +62,7 @@ public void testNumbers() throws Exception {
     doTest("12``12", "NUMBER ('12``12')");
   }
 
-  public void testRepeatedAmbiguity() throws Exception {
+  public void testRepeatedAmbiguity() {
     // Actually, this is not what Mathematica parses which is Repeated[1]
     // but the documentation states that the point for the number 1. should bind stronger
     doTest("1..", "NUMBER ('1.')\n" + "POINT ('.')");

tests/de/halirutan/mathematica/lang/resolve/LocalVariableResolveTestCase.kt

@@ -45,23 +45,37 @@ class LocalVariableResolveTestCase : AbstractResolveTest() {
       "Compile[{{x, _Real}, y, {z, _Real, 0}}, x+<ref>y+z ]" to TextRange.create(21, 22)
   )
 
+  private val ruleDelayedLike = mapOf(
+      "{test_, test_} :> <ref>test" to TextRange.create(1, 5),
+      "HoldComplete[ReturnPacket[{expr_ :> expr_}]] :> HoldComplete[<ref>expr]" to TextRange.create(27, 31)
+  )
+
   fun testModule() {
-    for (testCase in moduleLike) {
-      val psiReference = configureByFileText(testCase.key)
+    for ((key, value) in moduleLike) {
+      val psiReference = configureByFileText(key)
       val resolve = psiReference.resolve()
       TestCase.assertNotNull(resolve)
-      TestCase.assertEquals(testCase.value, resolve?.textRange)
-    }
+      TestCase.assertEquals(value, resolve?.textRange)
     }
+  }
 
   fun testCompile() {
-    for (testCase in compileLike) {
-      val ref = configureByFileText(testCase.key)
+    for ((key, value) in compileLike) {
+      val ref = configureByFileText(key)
       val resolve = ref.resolve()
       TestCase.assertNotNull(resolve)
-      TestCase.assertEquals(testCase.value, resolve?.textRange)
+      TestCase.assertEquals(value, resolve?.textRange)
     }
+  }
+
+  fun testRuleDelayed() {
+    for ((key, value) in ruleDelayedLike) {
+      val ref = configureByFileText(key)
+      val resolve = ref.resolve()
+      TestCase.assertNotNull(resolve)
+      TestCase.assertEquals(value, resolve?.textRange)
     }
+  }
 
 
 }

tests/de/halirutan/mathematica/lang/resolve/ResolvePerformanceTest.kt

@@ -23,9 +23,6 @@
 
 package de.halirutan.mathematica.lang.resolve
 
-import de.halirutan.mathematica.lang.psi.MathematicaRecursiveVisitor
-import de.halirutan.mathematica.lang.psi.api.Symbol
-
 
 /**
  * @author patrick (20.07.17).
@@ -37,14 +34,14 @@ class ResolvePerformanceTest : AbstractResolveTest() {
     val count = object {
       var value = 0
     }
-    val file = createFile("LargeFile.m", loadFile("LargeFile.m"))
+//    val file = createFile("LargeFile.m", loadFile("LargeFile.m"))
     val start = System.nanoTime()
-    file.accept(object : MathematicaRecursiveVisitor() {
-      override fun visitSymbol(symbol: Symbol) {
-        val resolve = symbol.resolve()
-        resolve?.let { count.value++ }
-      }
-    })
+//    file.accept(object : MathematicaRecursiveVisitor() {
+//      override fun visitSymbol(symbol: Symbol) {
+//        val resolve = symbol.resolve()
+//        resolve?.let { count.value++ }
+//      }
+//    })
     val stop = System.nanoTime()
     println("Resolved ${count.value} Symbols in ${(stop - start) / 1e9} seconds")
   }

tests/de/halirutan/mathematica/refactoring/RenameTest.java

@@ -29,7 +29,7 @@
  */
 public class RenameTest extends LightCodeInsightFixtureTestCase{
 
-  public void testNormalVariable() throws Exception {
+  public void testNormalVariable() {
     myFixture.configureByText(MathematicaFileType.INSTANCE,
         "var1;\n" +
             "var1::usage = \"var1 is equal to nothing..\";\n" +
@@ -40,7 +40,7 @@ public void testNormalVariable() throws Exception {
         "var2=1;");
   }
 
-  public void testModule() throws Exception {
+  public void testModule() {
     myFixture.configureByText(MathematicaFileType.INSTANCE,
         "var;\n" +
             "var::usage = \"var is equal to nothing..\";\n" +
@@ -61,14 +61,14 @@ public void testModule() throws Exception {
         "]");
   }
 
-  public void testUsage() throws Exception {
+  public void testUsage() {
     myFixture.configureByText(MathematicaFileType.INSTANCE,
         "func::usage = \"func<caret> is a function called like func[]\";");
     myFixture.renameElementAtCaret("newFunc");
     myFixture.checkResult("newFunc::usage = \"newFunc is a function called like newFunc[]\";");
   }
 
-  public void testUsage2() throws Exception {
+  public void testUsage2() {
     myFixture.configureByText(MathematicaFileType.INSTANCE,
         "func<caret>::usage = \"func is a function called like func[]\";");
     myFixture.renameElementAtCaret("newFunc");