Fixed wrong highlighting when using patterns and Set

Fixed equals and hashcode for lightSymbol

Author: halirutan

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

@@ -69,11 +69,30 @@ public SearchScope getUseScope() {
     return myFile.getUseScope();
   }
 
+  @Override
+  public int hashCode() {
+    int hash = 1;
+    hash = hash*17 + myName.hashCode();
+    hash = hash * 31 + myFile.hashCode();
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj != null && obj instanceof LightSymbol) {
+      return obj.hashCode() == hashCode();
+    }
+    return false;
+  }
+
   @Override
   public boolean isEquivalentTo(PsiElement another) {
-    if (another instanceof Symbol || another instanceof LightSymbol) {
-      final String name = ((PsiNamedElement) another).getName();
-      return myName.equals(name);
+    if (another instanceof Symbol) {
+      final PsiElement resolve = ((Symbol) another).resolve();
+      return resolve != null && resolve.equals(this);
+    }
+    if (another instanceof LightSymbol) {
+      return another.hashCode() == hashCode();
     }
     return false;
   }

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

@@ -220,6 +220,6 @@ public Object[] getVariants() {
 
   @Override
   public boolean isSoft() {
-    return true;
+    return false;
   }
 }

src/de/halirutan/mathematica/lang/psi/util/MathematicaPatternVisitor.java

@@ -45,6 +45,9 @@ public class MathematicaPatternVisitor extends MathematicaVisitor {
 
   private final Set<Symbol> myPatternSymbols = Sets.newHashSet();
   private final LinkedHashSet<Symbol> myUnboundSymbols = Sets.newLinkedHashSet();
+  /* Except | Longest | Optional | PatternTest | Repeated | RepeatedNull | Shortest
+  * HoldPattern | IgnoringInactive | KeyValuePattern | Literal | Longest | Optional | Repeated | RepeatedNull | Shortest
+  * */
   private final List<String> myDiveInFirstChild = Lists.newArrayList("Longest", "Shortest", "Repeated", "Optional", "PatternTest", "Condition");
   private final List<String> myDoNotDiveIn = Lists.newArrayList("Verbatim");
   private Assignment myAssignmentType = Assignment.NONE_;

src/de/halirutan/mathematica/lang/resolve/LocalDefinitionResolveProcessor.java

@@ -29,6 +29,7 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import de.halirutan.mathematica.lang.psi.api.FunctionCall;
 import de.halirutan.mathematica.lang.psi.api.Symbol;
+import de.halirutan.mathematica.lang.psi.api.assignment.Set;
 import de.halirutan.mathematica.lang.psi.api.assignment.SetDelayed;
 import de.halirutan.mathematica.lang.psi.api.assignment.TagSetDelayed;
 import de.halirutan.mathematica.lang.psi.api.rules.RuleDelayed;
@@ -144,12 +145,15 @@ public boolean execute(@NotNull PsiElement element, @NotNull ResolveState state)
           }
         }
       }
-    } else if (element instanceof SetDelayed || element instanceof TagSetDelayed) {
+    } else if (element instanceof SetDelayed || element instanceof TagSetDelayed || element instanceof Set) {
 
       MathematicaPatternVisitor patternVisitor = new MathematicaPatternVisitor();
       element.accept(patternVisitor);
       for (Symbol p : patternVisitor.getPatternSymbols()) {
         if (p.getFullSymbolName().equals(myStartElement.getFullSymbolName())) {
+          if (element instanceof Set && myStartElement != p) {
+            continue;
+          }
           myReferringSymbol = p;
           myLocalization = MScope.SETDELAYEDPATTERN;
           myLocalizationSymbol = element;