fix global type quick fix

go-lang-plugin-org · Sep 7, 2015 · 1134dbb · 1134dbb · ignatov · Sep 7, 2015
1 parent 2f9b170
commit 1134dbb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/com/goide/refactor/GoRefactoringUtil.java b/src/com/goide/refactor/GoRefactoringUtil.java
@@ -18,6 +18,7 @@
 
 import com.goide.psi.GoBlock;
 import com.goide.psi.GoStatement;
+import com.goide.psi.impl.GoPsiImplUtil;
 import com.intellij.codeInsight.PsiEquivalenceUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiRecursiveElementVisitor;
@@ -60,10 +61,11 @@ public static PsiElement findLocalAnchor(@NotNull List<PsiElement> occurrences)
 
   @Nullable
   public static PsiElement findAnchor(@NotNull List<PsiElement> occurrences, @Nullable PsiElement context) {
-    PsiElement statement = PsiTreeUtil.getNonStrictParentOfType(ContainerUtil.getFirstItem(occurrences), GoStatement.class);
+    PsiElement first = ContainerUtil.getFirstItem(occurrences);
+    PsiElement statement = PsiTreeUtil.getNonStrictParentOfType(first, GoStatement.class);
     while (statement != null && statement.getParent() != context) {
       statement = statement.getParent();
     }
-    return statement;
+    return statement == null ? GoPsiImplUtil.getTopLevelDeclaration(first) : statement;
   }
 }
diff --git a/testData/quickfixes/create-type/global-after.go b/testData/quickfixes/create-type/global-after.go
@@ -0,0 +1,5 @@
+package foo
+
+type A<caret>
+
+type ServerFunc func(params A) (error)
diff --git a/testData/quickfixes/create-type/global.go b/testData/quickfixes/create-type/global.go
@@ -0,0 +1,3 @@
+package foo
+
+type ServerFunc func(params A<caret>) (error)
diff --git a/tests/com/goide/quickfix/GoCreateTypeQuickFixTest.java b/tests/com/goide/quickfix/GoCreateTypeQuickFixTest.java
@@ -33,5 +33,6 @@ protected String getBasePath() {
   }
 
   public void testSimple()      { doTest(CREATE_TYPE_A);      }
+  public void testGlobal()      { doTest(CREATE_TYPE_A);      }
   public void testProhibited()  { doTestNoFix(CREATE_TYPE_A); }
 }