[groovy] fix completion of type parameters in var position (IDEA-191728)

This commit is contained in:
Daniil Ovchinnikov
2018-05-23 18:19:14 +03:00
parent f09c01ed00
commit f39c95e6e2
2 changed files with 3 additions and 7 deletions
@@ -127,12 +127,9 @@ public class GrMainCompletionProvider extends CompletionProvider<CompletionParam
if (parent instanceof GrVariable) {
final PsiElement pparent = parent.getParent();
if (pparent instanceof GrVariableDeclaration) {
final PsiElement errorElement = PsiUtil.skipWhitespacesAndComments(parent.getPrevSibling(), false);
if (errorElement instanceof PsiErrorElement) {
final PsiElement child = errorElement.getFirstChild();
if (child instanceof GrTypeParameterList) {
return (GrTypeParameterList)child;
}
PsiElement candidate = PsiUtil.skipWhitespacesAndComments(parent.getPrevSibling(), false);
if (candidate instanceof GrTypeParameterList) {
return (GrTypeParameterList)candidate;
}
}
}
@@ -102,7 +102,6 @@ class GroovyCompletionTest extends GroovyCompletionTestBase {
doVariantableTest("MyParameter", "MySecondParameter")
}
@Bombed(month = 6, day = 10, user = "daniil")
void testUnfinishedMethodTypeParameter2() {
doVariantableTest("MyParameter", "MySecondParameter")
}