Simplify self import quick fix, only delete import

Author: auduchinok

src/com/goide/inspections/GoSelfImportInspection.java

@@ -25,11 +25,14 @@
 public class GoSelfImportInspection extends GoInspectionBase {
   @Override
   protected void checkFile(@NotNull GoFile file, @NotNull ProblemsHolder problemsHolder) {
-    if (GoTestFinder.isTestFile(file) && GoTestFinder.isTestPackageName(file.getPackageName())) return;
+    if (GoTestFinder.isTestFile(file) && GoTestFinder.getTestTargetPackage(file) != null) return;
 
-    GoImportSpec selfImportSpec = file.getImportedPackagesMap().get(file.getImportPath());
-    if (selfImportSpec != null) {
-      problemsHolder.registerProblem(selfImportSpec, "Self import is not allowed", new GoSelfImportQuickFix("Remove self import"));
+    String fileImportPath = file.getImportPath();
+    for (GoImportSpec importSpec : file.getImports()) {
+      String path = importSpec.getPath();
+      if (path.equals(fileImportPath) || path.equals(".")) {
+        problemsHolder.registerProblem(importSpec, "Self import is not allowed", new GoSelfImportQuickFix("Remove self import"));
+      }
     }
   }
 }

src/com/goide/inspections/GoSelfImportQuickFix.java

@@ -16,25 +16,19 @@
 
 package com.goide.inspections;
 
-import com.goide.psi.*;
-import com.goide.psi.impl.GoElementFactory;
+import com.goide.psi.GoFile;
+import com.goide.psi.GoImportSpec;
 import com.intellij.codeInspection.LocalQuickFixBase;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiRecursiveElementVisitor;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Map;
-
 public class GoSelfImportQuickFix extends LocalQuickFixBase {
 
-  protected GoSelfImportQuickFix(@NotNull String name) {
+  protected GoSelfImportQuickFix(String name) {
     super(name);
   }
 
@@ -44,34 +38,10 @@ public void applyFix(@NotNull final Project project, @NotNull ProblemDescriptor
     final PsiFile file = element != null ? element.getContainingFile() : null;
     if (!(element instanceof GoImportSpec && file instanceof GoFile)) return;
 
-    final Map<GoReferenceExpressionBase, String> usages = ContainerUtil.newHashMap();
-    file.acceptChildren(new PsiRecursiveElementVisitor() {
-      public void visitElement(@NotNull PsiElement element) {
-        if (element instanceof GoReferenceExpression || element instanceof GoTypeReferenceExpression) {
-          PsiReference reference = element.getReference();
-          PsiElement definition = reference != null ? reference.resolve() : null;
-          PsiFile definitionFile = definition instanceof GoNamedElement ? definition.getContainingFile() : null;
-          if (definitionFile != null && definitionFile.getParent() == file.getParent()) {
-            usages.put((GoReferenceExpressionBase)element, ((GoNamedElement)definition).getName());
-            return;
-          }
-        }
-        super.visitElement(element);
-      }
-    });
     WriteCommandAction.runWriteCommandAction(project, new Runnable() {
       @Override
       public void run() {
-        for (Map.Entry<GoReferenceExpressionBase, String> usage : usages.entrySet()) {
-          GoReferenceExpressionBase expression = usage.getKey();
-          expression.replace(expression instanceof GoReferenceExpression
-                                      ? GoElementFactory.createReferenceExpression(project, usage.getValue())
-                                      : GoElementFactory.createTypeReferenceExpression(project, usage.getValue()));
-        }
-        GoImportDeclaration importDeclaration = PsiTreeUtil.getParentOfType(element, GoImportDeclaration.class);
-        assert importDeclaration != null;
-        PsiElement elementToDelete = importDeclaration.getImportSpecList().size() == 1 ? importDeclaration : element;
-        elementToDelete.delete();
+        ((GoFile)file).deleteImport((GoImportSpec)element);
       }
     });
   }

src/com/goide/psi/GoFile.java

@@ -43,6 +43,7 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayFactory;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
@@ -434,6 +435,13 @@ public boolean hasCPathImport() {
     return getImportMap().containsKey(GoConstants.C_PATH);
   }
 
+  public void deleteImport(@NotNull GoImportSpec importSpec) {
+    GoImportDeclaration importDeclaration = PsiTreeUtil.getParentOfType(importSpec, GoImportDeclaration.class);
+    assert importDeclaration != null;
+    PsiElement elementToDelete = importDeclaration.getImportSpecList().size() == 1 ? importDeclaration : importSpec;
+    elementToDelete.delete();
+  }
+
   private static boolean processChildrenDummyAware(@NotNull GoFile file, @NotNull final Processor<PsiElement> processor) {
     StubTree stubTree = file.getStubTree();
     if (stubTree != null) {

src/com/goide/runconfig/testing/GoTestFinder.java

@@ -46,10 +46,6 @@ public static boolean isTestFile(@Nullable VirtualFile file) {
     return file != null && file.getFileType() == GoFileType.INSTANCE && file.getNameWithoutExtension().endsWith(GoConstants.TEST_SUFFIX);
   }
 
-  public static boolean isTestPackageName(@Nullable String packageName) {
-    return packageName != null && packageName.endsWith(GoConstants.TEST_SUFFIX);
-  }
-
   @Nullable
   public static String getTestFunctionName(@NotNull GoFunctionOrMethodDeclaration function) {
     return GoTestFunctionType.fromName(function.getName()) == GoTestFunctionType.TEST ? StringUtil.notNullize(function.getName()) : null;

testData/quickfixes/self-import/a.go

@@ -17,34 +17,30 @@
 package com.goide.quickfix;
 
 import com.goide.inspections.GoSelfImportInspection;
-import com.intellij.testFramework.LightProjectDescriptor;
+import com.intellij.openapi.vfs.VirtualFile;
+
+import java.io.IOException;
 
 public class GoSelfImportQuickFixTest extends GoQuickFixTestBase {
   @Override
   public void setUp() throws Exception {
     super.setUp();
     myFixture.enableInspections(GoSelfImportInspection.class);
-    setUpProjectSdk();
-  }
-
-  @Override
-  protected LightProjectDescriptor getProjectDescriptor() {
-    return createMockProjectDescriptor();
-  }
-
-  @Override
-  protected String getBasePath() {
-    return "quickfixes/self-import";
   }
 
   @Override
   protected boolean isWriteActionRequired() {
     return false;
   }
 
-  public void testRemoveSelfImport() {
-    myFixture.configureByFile("b.go");
-    //applySingleQuickFix("Remove self import");
-    //myFixture.checkResultByFile("b-after.go");
+  public void testRemoveSelfImport() throws IOException {
+    VirtualFile file = myFixture.getTempDirFixture().createFile("path/a.go", "package pack; import <caret>\"path\"");
+    myFixture.configureFromExistingVirtualFile(file);
+    applySingleQuickFix("Remove self import");
+  }
+
+  public void testRemoveRelativeSelfImport() {
+    myFixture.configureByText("a.go", "package pack; import <caret>\".\"");
+    applySingleQuickFix("Remove self import");
   }
 }