Tweak the package autoimports.

Author: mtoader

src/ro/redeul/google/go/inspection/UnresolvedSymbols.java

@@ -38,7 +38,7 @@ public String getDisplayName() {
     }
 
     @Override
-    protected void doCheckFile(@NotNull GoFile file,
+    protected void doCheckFile(@NotNull final GoFile file,
                                @NotNull final InspectionResult result) {
         new GoRecursiveElementVisitor() {
             @Override
@@ -60,24 +60,21 @@ public void visitLiteralIdentifier(GoLiteralIdentifier identifier) {
                                             boolean hasPackageReference = false;
                                             boolean hasVarReferences = false;
                                             for (PsiReference ref : refs) {
-                                                if (ref instanceof PackageReference)
-                                                    hasPackageReference = true;
+                                                if (ref instanceof PackageReference) {
+                                                    getData().add(new AddImportFix(identifier));
+                                                }
 
                                                 if (ref instanceof VarOrConstReference)
-                                                    hasVarReferences = true;
-                                            }
+                                                    if (isGlobalVariableIdentifier(identifier))
+                                                        getData().add(new CreateGlobalVariableFix(identifier));
+                                                    else
+                                                        getData()
+                                                                .add(new CreateLocalVariableFix(identifier))
+                                                                .add(new CreateGlobalVariableFix(identifier))
+                                                                .add(new CreateFunctionFix(identifier))
+                                                                .add(new CreateClosureFunctionFix(identifier));
 
-                                            if ( hasVarReferences )
-                                                if ( isGlobalVariableIdentifier(identifier) )
-                                                    getData().add(new CreateGlobalVariableFix(identifier));
-                                                else
-                                                    getData()
-                                                            .add(new CreateLocalVariableFix(identifier))
-                                                            .add(new CreateGlobalVariableFix(identifier))
-                                                            .add(new CreateFunctionFix(identifier))
-                                                            .add(new CreateClosureFunctionFix(identifier));
-                                            else if ( hasPackageReference )
-                                                getData().add(new AddImportFix(identifier));
+                                            }
 
                                             ((GoPsiElement) identifier.getParent()).accept(this);
                                         }
@@ -113,7 +110,7 @@ id, message("warning.unresolved.symbol", id.getText()),
 
     private static boolean isGlobalVariableIdentifier(GoLiteralIdentifier ident) {
         return findParentOfType(ident, GoSelectorExpression.class) == null &&
-               findParentOfType(ident, GoFunctionDeclaration.class) == null &&
-               findParentOfType(ident, GoVarDeclarations.class) != null;
+                findParentOfType(ident, GoFunctionDeclaration.class) == null &&
+                findParentOfType(ident, GoVarDeclarations.class) != null;
     }
 }

src/ro/redeul/google/go/inspection/fix/AddImportFix.java

@@ -169,7 +169,7 @@ public boolean execute() {
     @Override
     public boolean isAvailable(@NotNull Project project, @NotNull PsiFile file, @NotNull PsiElement startElement, @NotNull PsiElement endElement) {
         PackageReference reference = GoReferenceImporter.getPackageReferenceAt(file, startElement.getTextOffset());
-        return reference != null && reference.resolve() == null;
+        return reference != null && reference.resolve() == null && findPotentialImports(startElement).size() > 0;
     }
 
     @NotNull

src/ro/redeul/google/go/lang/psi/typing/GoTypes.java

@@ -73,7 +73,7 @@ public static GoType get(GoType[] types) {
 
     public static GoType[] getPackageType(GoImportDeclaration declaration) {
         GoPackage goPackage = declaration.getPackage();
-        return goPackage != null ? new GoType[]{new GoTypePackage(goPackage)} : GoType.EMPTY_ARRAY;
+        return new GoType[]{new GoTypePackage(goPackage)};
     }
 
     /**

src/ro/redeul/google/go/services/GoPsiManager.java

@@ -78,14 +78,15 @@ public <T extends GoPsiElement, V> GoType getOrCompute(T element, Function<T, Go
         if (type == null) {
             RecursionGuard.StackStamp stamp = outSecondGuard.markStack();
             type = valueCalculator.fun(element);
-            if ( type != null ) {
-                if (stamp.mayCacheNow()) {
-                    type = ConcurrencyUtil.cacheOrGet(myComputedType, element, type);
-                } else {
-                    final GoType alreadyInferred = myComputedType.get(element);
-                    if (alreadyInferred != null) {
-                        type = alreadyInferred;
-                    }
+            if ( type == null )
+                type = GoType.Unknown;
+
+            if (stamp.mayCacheNow()) {
+                type = ConcurrencyUtil.cacheOrGet(myComputedType, element, type);
+            } else {
+                final GoType alreadyInferred = myComputedType.get(element);
+                if (alreadyInferred != null) {
+                    type = alreadyInferred;
                 }
             }
         }