More work on better reference search

Author: halirutan

resources/META-INF/plugin.xml

@@ -44,8 +44,6 @@
     <lang.psiStructureViewFactory language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.structureview.MathematicaStructureViewFactory"/>
     <lang.documentationProvider language="Mathematica" implementationClass="de.halirutan.mathematica.documentation.MathematicaDocumentationProvider"/>
 
-    <annotator language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.highlighting.MathematicaHighlightingAnnotator"/>
-
     <psi.referenceContributor language="Mathematica" implementation="de.halirutan.mathematica.lang.resolve.MathematicaReferenceContributor"/>
     <fileBasedIndex implementation="de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex"/>
     <lang.refactoringSupport language="Mathematica" implementationClass="de.halirutan.mathematica.refactoring.MathematicaRefactoringSupport"/>
@@ -88,7 +86,12 @@
     <additionalTextAttributes scheme="Darcula" file="colors/MathematicaDarcula.xml"/>
     <additionalTextAttributes scheme="Default" file="colors/MathematicaDefault.xml"/>
     <lang.refactoringSupport language="Mathematica" implementationClass="de.halirutan.mathematica.refactoring.MathematicaRefactoringSupport"/>
-    <annotator language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.highlighting.CommentAnnotator"/>
+
+    <annotator language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.highlighting.annotators.LocalizedSymbolAnnotator"/>
+    <annotator language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.highlighting.annotators.CommentAnnotator"/>
+    <annotator language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.highlighting.annotators.MessageNameAnnotator"/>
+    <annotator language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.highlighting.annotators.StringifiedSymbolAnnotator"/>
+    <annotator language="Mathematica" implementationClass="de.halirutan.mathematica.codeinsight.highlighting.annotators.FunctionAnnotator"/>
 
     <inspectionToolProvider implementation="de.halirutan.mathematica.codeinsight.inspections.MathematicaInspectionProvider"/>
 
@@ -105,6 +108,7 @@
     <!--<findUsagesHandlerFactory implementation="de.halirutan.mathematica.find.MathematicaFindUsageHandlerFactory"/>-->
 
     <errorHandler implementation="de.halirutan.mathematica.errorreporting.GitHubErrorReporter"/>
+      <referencesSearch implementation="de.halirutan.mathematica.lang.search.MathematicaReferenceSearch"/>
   </extensions>
 
   <actions>

resources/de/halirutan/mathematica/MathematicaInspectionBundle.properties

@@ -21,6 +21,7 @@
 
 group.bugs=Probable Errors
 group.codestyle=Code Style
+group.symbol=Symbols
 
 consistent.compound.expression.in.file.name=Missing semicolon at file-scope
 consistent.compound.expression.in.file.description=At file scope it is considered good code-style, when all separate expressions are closed with a semicolon.
@@ -30,3 +31,6 @@ bugs.implicit.times.through.linebreak.description=This linebreak is interpreted
 bugs.implicit.times.through.linebreak.message=Missing comma or semicolon
 bugs.unsupported.version.name=Function is part of later version
 bugs.unsupported.version.description=Reports functions or symbols that are part of a later version of Mathematica than specified. Per default, the language version of the specified Mathematica SDK is used.
+symbol.unresolved.name=Unresolved Symbol
+symbol.unresolved.description=The place where this symbol is defined could not be found. This usually means that you used a symbol that has no definition, no usage message, is not a built-in symbol or is not locally bound by Module, Table, Compile, ...
+symbol.unresolved.message=Could not resolve symbol declaration

src/de/halirutan/mathematica/codeinsight/structureview/groupers/AssignmentTypeGroup.java

@@ -46,7 +46,7 @@ public class AssignmentTypeGroup implements Group, CodePlaceProvider, ColoredIte
   private final Collection<TreeElement> myTreeElements;
   private final SymbolAssignmentType myType;
 
-  public AssignmentTypeGroup(final SymbolAssignmentType type, final Collection<TreeElement> treeElements) {
+  AssignmentTypeGroup(final SymbolAssignmentType type, final Collection<TreeElement> treeElements) {
     this.myTreeElements = treeElements;
     this.myType = type;
   }
@@ -83,11 +83,11 @@ public TextAttributesKey getTextAttributesKey() {
       case UP_SET_DELAYED_ASSIGNMENT:
         return DefaultLanguageHighlighterColors.INSTANCE_METHOD;
       case MESSAGE_ASSIGNMENT:
-        return MathematicaSyntaxHighlighterColors.MESSAGE;
+        return MathematicaSyntaxHighlighterColors.INSTANCE.getMESSAGE();
       case OPTIONS_ASSIGNMENT:
-        return MathematicaSyntaxHighlighterColors.MODULE_LOCALIZED;
+        return MathematicaSyntaxHighlighterColors.INSTANCE.getMODULE_LOCALIZED();
       case ATTRIBUTES_ASSIGNMENT:
-        return MathematicaSyntaxHighlighterColors.BUILTIN_FUNCTION;
+        return MathematicaSyntaxHighlighterColors.INSTANCE.getBUILTIN_FUNCTION();
     }
     return null;
   }

src/de/halirutan/mathematica/intentions/localization/MoveVariableToLocalisation.java

@@ -81,7 +81,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file
         PsiElement resolve = reference.resolve();
         if (resolve instanceof Symbol) {
           LocalizationConstruct.MScope elementConstruct = ((Symbol) resolve).getLocalizationConstruct();
-          if (elementConstruct != LocalizationConstruct.MScope.NULL) {
+          if (elementConstruct != LocalizationConstruct.MScope.NULL_SCOPE) {
             return false;
           }
         }

src/de/halirutan/mathematica/lang/psi/api/FunctionCall.java

@@ -75,7 +75,7 @@ public interface FunctionCall extends PsiElement {
   /**
    * Returns the type of scoping construct, if the function call is e.g. <code >Module[..]</code>
    *
-   * @return The scoping construct or MScope.NULL if it is no scoping construct.
+   * @return The scoping construct or MScope.NULL_SCOPE if it is no scoping construct.
    */
   MScope getScopingConstruct();
 

src/de/halirutan/mathematica/lang/psi/api/Symbol.java

@@ -24,7 +24,6 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
 import com.intellij.psi.PsiReference;
-import de.halirutan.mathematica.lang.psi.util.LocalizationConstruct;
 import de.halirutan.mathematica.lang.psi.util.LocalizationConstruct.MScope;
 import de.halirutan.mathematica.lang.resolve.SymbolResolveResult;
 
@@ -51,6 +50,7 @@ public interface Symbol extends PsiNameIdentifierOwner, PsiReference {
 
   /**
    * Returns the full name of the symbol with context.
+   *
    * @return Symbol name with context
    */
   String getFullSymbolName();
@@ -68,4 +68,10 @@ public interface Symbol extends PsiNameIdentifierOwner, PsiReference {
   SymbolResolveResult advancedResolve();
 
   boolean isSelfReference();
+
+  /**
+   * Checks if this symbol is locally scoped by Module, ...
+   * @return true if it is bound by a localization function
+   */
+  boolean isLocallyBound();
 }

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

@@ -33,23 +33,22 @@
 import de.halirutan.mathematica.lang.psi.util.LocalizationConstruct.MScope;
 import de.halirutan.mathematica.lang.resolve.processors.SymbolResolveHint;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 public class FunctionCallImpl extends ExpressionImpl implements FunctionCall {
 
-//  private final Key<Object> myScopeKey = Key.create("SCOPING_CONSTRUCT");
-//  private boolean myIsUpToDate;
-  private String myHead;
-  private MScope myLocalizationConstruct = MScope.NULL;
+  private final String myHead;
+  private MScope myLocalizationConstruct = MScope.NULL_SCOPE;
+  private final boolean myIsScopingFunction;
 
 
   public FunctionCallImpl(@NotNull ASTNode node) {
     super(node);
 //    myIsUpToDate = false;
     myHead = node.getFirstChildNode().getText();
-    myLocalizationConstruct = LocalizationConstruct.getType(myHead);
+    myIsScopingFunction = LocalizationConstruct.isScopingFunction(myHead);
+    myLocalizationConstruct = myIsScopingFunction ? LocalizationConstruct.getScope(myHead) : MScope.NULL_SCOPE;
   }
 
   @Override
@@ -125,36 +124,15 @@ public List<PsiElement> getParameters() {
     return allArguments;
   }
 
-
-  /**
-   * Extracts the head of the function call and looks whether it is in the list {@link #SCOPING_CONSTRUCTS}. This can
-   * lead to various false negatives. E.g. <code >(Block)[{..},..]</code> returns false, although after <em
-   * >evaluating</em> the code in Mathematica, it's of course found to be a correct scoping construct. Btw, the
-   * Mathematica front end has the same issues.
-   *
-   * @return True iff the head is a symbol defining the function as scoping construct like <code >Block[{..},..]</code>.
-   */
-
   @Override
   public boolean isScopingConstruct() {
-    return myLocalizationConstruct != MScope.NULL;
+    return myIsScopingFunction;
   }
 
   @Override
   public MScope getScopingConstruct() {
     return myLocalizationConstruct;
   }
-//
-//  private void cacheScopingConstruct() {
-//    if (myIsUpToDate) return;
-//    PsiElement head = getFirstChild();
-//    if (head instanceof Symbol) {
-//      cacheScopingConstruct(((Symbol) head).getSymbolName());
-//    } else {
-//      putUserData(myScopeKey, MScope.NULL);
-//    }
-//    myIsUpToDate = true;
-//  }
 
   @Override
   public void accept(@NotNull PsiElementVisitor visitor) {

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

@@ -34,4 +34,6 @@ public LightBuiltInSymbol(@NotNull Symbol symbol) {
     super(symbol);
   }
 
+
+
 }

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

@@ -34,7 +34,7 @@
  */
 public class LightSymbol extends LightElement implements PsiNamedElement {
   private String myName;
-  private PsiFile myFile;
+  private final PsiFile myFile;
 
   LightSymbol(@NotNull Symbol symbol) {
     super(symbol.getManager(), MathematicaLanguage.INSTANCE);
@@ -79,10 +79,7 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj != null && obj instanceof LightSymbol) {
-      return obj.hashCode() == hashCode();
-    }
-    return false;
+    return obj != null && obj instanceof LightSymbol && obj.hashCode() == hashCode();
   }
 
   @Override
@@ -91,9 +88,6 @@ public boolean isEquivalentTo(PsiElement another) {
       final PsiElement resolve = ((Symbol) another).resolve();
       return resolve != null && resolve.equals(this);
     }
-    if (another instanceof LightSymbol) {
-      return another.hashCode() == hashCode();
-    }
-    return false;
+    return another instanceof LightSymbol && another.hashCode() == hashCode();
   }
 }

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

@@ -30,6 +30,7 @@
 import de.halirutan.mathematica.lang.parsing.MathematicaElementTypes;
 import de.halirutan.mathematica.lang.psi.MathematicaVisitor;
 import de.halirutan.mathematica.lang.psi.api.Symbol;
+import de.halirutan.mathematica.lang.psi.util.LocalizationConstruct;
 import de.halirutan.mathematica.lang.psi.util.LocalizationConstruct.MScope;
 import de.halirutan.mathematica.lang.resolve.MathematicaSymbolResolver;
 import de.halirutan.mathematica.lang.resolve.SymbolResolveResult;
@@ -59,9 +60,11 @@ public class SymbolImpl extends ExpressionImpl implements Symbol {
 
   private static final MathematicaSymbolResolver RESOLVER = new MathematicaSymbolResolver();
 
-  private MScope myScope = MScope.NULL;
+  private MScope myScope = MScope.NULL_SCOPE;
+  private PsiElement myScopeElement = null;
   private boolean mySelfReferenceQ = false;
 
+
   public SymbolImpl(ASTNode node) {
     super(node);
   }
@@ -165,6 +168,9 @@ public PsiElement resolve() {
     final SymbolResolveResult symbolResolveResult = advancedResolve();
     if (symbolResolveResult != null) {
       myScope = symbolResolveResult.getLocalization();
+      if (LocalizationConstruct.isLocalScoping(myScope)) {
+        myScopeElement = symbolResolveResult.getElement();
+      }
       mySelfReferenceQ = Objects.equals(symbolResolveResult.getElement(), this);
       return symbolResolveResult.getElement();
     }
@@ -182,6 +188,11 @@ public boolean isSelfReference() {
     return mySelfReferenceQ;
   }
 
+  @Override
+  public boolean isLocallyBound() {
+    return myScopeElement != null && myScopeElement.isValid();
+  }
+
   @NotNull
   @Override
   public String getCanonicalText() {