From ea31c5543ffa1a503dbc714ad4387fc1adc7d9fa Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 11 May 2017 16:55:27 +0300 Subject: [PATCH] junit 5: search for method providers in the same class as test method --- .../junit/codeInsight/references/MethodSourceReference.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java b/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java index a1ac37f14149..213436e6096e 100644 --- a/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java +++ b/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java @@ -19,7 +19,6 @@ import com.intellij.codeInsight.lookup.AutoCompletionPolicy; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -44,7 +43,7 @@ public class MethodSourceReference extends PsiReferenceBase { @Nullable public PsiElement resolve() { - final PsiClass cls = PsiUtil.getTopLevelClass(getElement()); + final PsiClass cls = PsiTreeUtil.getParentOfType(getElement(), PsiClass.class); if (cls != null) { PsiMethod[] methods = cls.findMethodsByName(getValue(), false); return Arrays.stream(methods) @@ -58,7 +57,7 @@ public class MethodSourceReference extends PsiReferenceBase { @NotNull public Object[] getVariants() { final List list = new ArrayList<>(); - final PsiClass topLevelClass = PsiUtil.getTopLevelClass(getElement()); + final PsiClass topLevelClass = PsiTreeUtil.getParentOfType(getElement(), PsiClass.class); if (topLevelClass != null) { final PsiMethod current = PsiTreeUtil.getParentOfType(getElement(), PsiMethod.class); final PsiMethod[] methods = topLevelClass.getMethods();