Merge cleanup. Add extra test

Author: zolotov

src/com/goide/inspections/GoSelfImportInspection.java

@@ -19,20 +19,45 @@
 import com.goide.psi.GoFile;
 import com.goide.psi.GoImportSpec;
 import com.goide.runconfig.testing.GoTestFinder;
+import com.intellij.codeInspection.LocalQuickFixBase;
+import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 
 public class GoSelfImportInspection extends GoInspectionBase {
   @Override
   protected void checkFile(@NotNull GoFile file, @NotNull ProblemsHolder problemsHolder) {
-    if (GoTestFinder.isTestFile(file) && GoTestFinder.getTestTargetPackage(file) != null) return;
+    if (GoTestFinder.getTestTargetPackage(file) != null) return;
 
     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"));
+        problemsHolder.registerProblem(importSpec, "Self import is not allowed", new GoSelfImportQuickFix());
       }
     }
   }
+
+  public static class GoSelfImportQuickFix extends LocalQuickFixBase {
+    protected GoSelfImportQuickFix() {
+      super("Remove self import");
+    }
+    @Override
+    public void applyFix(@NotNull final Project project, @NotNull ProblemDescriptor descriptor) {
+      final PsiElement element = descriptor.getPsiElement();
+      final PsiFile file = element != null ? element.getContainingFile() : null;
+      if (!(element instanceof GoImportSpec && file instanceof GoFile)) return;
+  
+      WriteCommandAction.runWriteCommandAction(project, new Runnable() {
+        @Override
+        public void run() {
+          ((GoFile)file).deleteImport((GoImportSpec)element);
+        }
+      });
+    }
+  }
 }

src/com/goide/inspections/GoSelfImportQuickFix.java

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-public class GoSelfImportQuickFixTest extends GoQuickFixTestBase {
+public class GoSelfImportInspectionTest extends GoQuickFixTestBase {
   @Override
   public void setUp() throws Exception {
     super.setUp();
@@ -34,13 +34,22 @@ protected boolean isWriteActionRequired() {
   }
 
   public void testRemoveSelfImport() throws IOException {
-    VirtualFile file = myFixture.getTempDirFixture().createFile("path/a.go", "package pack; import <caret>\"path\"");
+    VirtualFile file = myFixture.getTempDirFixture().createFile("path/a.go", "package pack;" +
+                                                                             "import <error descr=\"Self import is not allowed\"><caret>\"path\"</error>");
     myFixture.configureFromExistingVirtualFile(file);
+    myFixture.checkHighlighting();
     applySingleQuickFix("Remove self import");
   }
 
   public void testRemoveRelativeSelfImport() {
-    myFixture.configureByText("a.go", "package pack; import <caret>\".\"");
+    myFixture.configureByText("a.go", "package pack; import <error descr=\"Self import is not allowed\"><caret>\".\"</error>");
+    myFixture.checkHighlighting();
     applySingleQuickFix("Remove self import");
   }
+
+  public void testDoNotConsiderImportFromTestPackageAsSelfImport() throws IOException {
+    VirtualFile file = myFixture.getTempDirFixture().createFile("path/a_test.go", "package pack_test; import <caret>\"path\"");
+    myFixture.configureFromExistingVirtualFile(file);
+    myFixture.checkHighlighting();
+  }
 }