Merge cleanup

Author: zolotov

src/com/goide/GoFindUsagesProvider.java

@@ -22,7 +22,6 @@
 import com.intellij.lang.cacheBuilder.DefaultWordsScanner;
 import com.intellij.lang.cacheBuilder.WordsScanner;
 import com.intellij.lang.findUsages.FindUsagesProvider;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.ElementDescriptionUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.TokenSet;
@@ -43,7 +42,7 @@ public WordsScanner getWordsScanner() {
   public boolean canFindUsagesFor(@NotNull PsiElement element) {
     if (element instanceof GoImportSpec) {
       GoImportSpec importSpec = (GoImportSpec)element;
-      return !StringUtil.isEmpty(importSpec.getAlias()) && !importSpec.isDot() && !importSpec.isForSideEffects();
+      return importSpec.getAlias() != null && !importSpec.isDot() && !importSpec.isForSideEffects();
     }
     return element instanceof GoNamedElement;
   }

src/com/goide/refactor/GoRenameImportSpecProcessor.java

@@ -17,7 +17,7 @@
 package com.goide.refactor;
 
 import com.goide.psi.GoImportSpec;
-import com.goide.psi.impl.GoPsiImplUtil;
+import com.intellij.find.FindManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.RefactoringBundle;
@@ -30,13 +30,13 @@ public class GoRenameImportSpecProcessor extends RenamePsiElementProcessor {
   @Nullable
   @Override
   public PsiElement substituteElementToRename(PsiElement element, @Nullable Editor editor) {
-    GoImportSpec importSpec = (GoImportSpec)element;
-    if (importSpec.isDot()) {
-      String message = RefactoringBundle.message("error.cannot.be.renamed");
-      CommonRefactoringUtil.showErrorHint(element.getProject(), editor, message, RefactoringBundle.message("rename.title"), null);
-      return null;
+    if (FindManager.getInstance(element.getProject()).canFindUsages(element)) {
+      return element;
     }
-    return importSpec.getAlias() != null ? element : importSpec.getImportString().resolve();
+    
+    String message = RefactoringBundle.message("error.cannot.be.renamed");
+    CommonRefactoringUtil.showErrorHint(element.getProject(), editor, message, RefactoringBundle.message("rename.title"), null);
+    return null;
   }
 
   @Override

tests/com/goide/rename/GoRenameTest.java

@@ -46,20 +46,11 @@ public void testImportAlias() {
   }
 
   public void testDotImportAlias() {
-    myFixture.configureByText("foo.go", "package foo; import <caret>. \"fmt\"");
-    try {
-      myFixture.renameElementAtCaret("bar");
-      fail("Shouldn't be performed");
-    }
-    catch (CommonRefactoringUtil.RefactoringErrorHintException e) {
-      assertEquals("This element cannot be renamed", e.getMessage());
-    }
+    doTestDoNotRename("package foo; import <caret>. \"fmt\"");
   }
 
-  private void doTestDoNotRename(String text) {
-    myFixture.configureByText("foo.go", text);
-    myFixture.renameElementAtCaret("bar");
-    myFixture.checkResult(text);
+  public void testBlankImportAlias() {
+    doTestDoNotRename("package foo; import <caret>_ \"fmt\"");
   }
 
   public void testNullAlias() {
@@ -75,4 +66,16 @@ private void doTest(String before, String newName, String after) {
     myFixture.renameElementAtCaret(newName);
     myFixture.checkResult(after);
   }
+
+  private void doTestDoNotRename(String text) {
+    myFixture.configureByText("foo.go", text);
+    try {
+      myFixture.renameElementAtCaret("bar");
+      fail("Shouldn't be performed");
+    }
+    catch (CommonRefactoringUtil.RefactoringErrorHintException e) {
+      assertEquals("This element cannot be renamed", e.getMessage());
+    }
+    myFixture.checkResult(text);
+  }
 }