Optimize the resolving a little bit

Author: mtoader

src/ro/redeul/google/go/lang/packages/GoPackages.java

@@ -163,7 +163,7 @@ public GoPackage getBuiltinPackage() {
 
     @NotNull
     public static GoPackage getPackageFor(@Nullable PsiElement element) {
-        if ( element == null )
+        if ( element == null || !(element.isValid()))
             return GoPackages.Invalid;
 
         GoPackages goPackages = getInstance(element.getProject());

src/ro/redeul/google/go/lang/psi/impl/GoPsiElementBase.java

@@ -79,7 +79,7 @@ final public PsiReference getReference() {
     @Override
     final public PsiReference[] getReferences() {
 //        System.out.println("" + hashCode() + ", refs: " + myReferences + " text: " + getText() + " ");
-//        if (myReferences == null)
+        if (myReferences == null)
             myReferences = defineReferences();
 
         return myReferences;

src/ro/redeul/google/go/lang/psi/impl/expressions/binary/GoMultiplicativeExpressionImpl.java

@@ -123,6 +123,9 @@ protected GoType computeConstant(@NotNull GoTypeConstant left, @NotNull GoTypeCo
 
                     return GoTypes.constant(Integer, leftValue.divide(rightValue));
                 case Remainder:
+                    if ( rightValue.compareTo(BigInteger.ZERO) == 0 )
+                        return GoType.Unknown;
+
                     return GoTypes.constant(Integer, leftValue.divideAndRemainder(rightValue)[1]);
                 case BitAnd:
                     return GoTypes.constant(Integer, leftValue.and(rightValue));

src/ro/redeul/google/go/lang/psi/impl/toplevel/GoMethodDeclarationImpl.java

@@ -45,6 +45,5 @@ public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
         // if we are coming from a child then we should expose the
         // method receiver as a declaration
         return !(lastParent != null && !processor.execute(getMethodReceiver(), state));
-
     }
 }

src/ro/redeul/google/go/lang/psi/resolve/refs/PackageReference.java

@@ -3,6 +3,8 @@
 import com.intellij.patterns.ElementPattern;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import ro.redeul.google.go.lang.packages.GoPackages;
 import ro.redeul.google.go.lang.psi.expressions.literals.GoLiteralIdentifier;
 import ro.redeul.google.go.lang.psi.expressions.primary.GoLiteralExpression;
 import ro.redeul.google.go.lang.psi.expressions.primary.GoSelectorExpression;
@@ -43,6 +45,12 @@ public void walkSolver(PackageSolver solver) {
                 ResolveStates.initial());
     }
 
+    @Nullable
+    @Override
+    public PsiElement resolve() {
+        PsiElement resolved = super.resolve();
+        return resolved == GoPackages.Invalid ? null : resolved;
+    }
 
     @Override
     public boolean isReferenceTo(PsiElement element) {

src/ro/redeul/google/go/lang/psi/resolve/refs/PackageSolver.java

@@ -1,5 +1,8 @@
 package ro.redeul.google.go.lang.psi.resolve.refs;
 
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+import ro.redeul.google.go.lang.packages.GoPackages;
 import ro.redeul.google.go.lang.psi.GoPackage;
 import ro.redeul.google.go.lang.psi.GoPackageReference;
 import ro.redeul.google.go.lang.psi.resolve.ReferenceSolvingVisitor;
@@ -27,11 +30,17 @@ boolean isReferenceTo(GoImportDeclaration importDeclaration) {
                     packageName = packageReference.getString();
                 else {
                     GoPackage goPackage = importDeclaration.getPackage();
-                    packageName = goPackage != null ? goPackage.getName() : "";
+                    packageName = goPackage.getName();
                 }
 
                 return packageName != null && matchNames(reference.name(), packageName);
             }
         });
     }
+
+    @Override
+    public PsiElement resolve(@NotNull PackageReference reference, boolean incompleteCode) {
+        PsiElement resolve = super.resolve(reference, incompleteCode);
+        return resolve == null ? GoPackages.Invalid : resolve;
+    }
 }

src/ro/redeul/google/go/lang/psi/resolve/refs/ShortVarReference.java

@@ -45,6 +45,7 @@ protected void walkSolver(ShortVarSolver solver) {
         GoBlockStatement blockStatement = getAs(GoBlockStatement.class, declaration.getParent());
 
         if ( blockStatement != null ) {
+//            System.out.println(blockStatement.getText());
             if ( !blockStatement.processDeclarations(solver, ResolveStates.initial(), declaration, this.getElement()))
                 return;