From 6bf0152f6d1b8edc632bd2dfaf97cfebf4bd2a5d Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 17 Oct 2014 10:36:31 +0400 Subject: [PATCH] Fix KotlinEvaluateExpressionTestGenerated:testSimple --- .../debugger/KotlinDebuggerTestCase.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java index 976560d49d1..aa2a8cd8188 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java @@ -44,9 +44,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; -import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription; import org.jetbrains.jet.testing.ConfigLibraryUtil; -import org.jetbrains.jet.utils.PathUtil; import java.io.File; import java.util.ArrayList; @@ -183,22 +181,24 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { @Override protected void createBreakpoints(final String className) { - PsiClass psiClass = ApplicationManager.getApplication().runReadAction(new Computable() { + PsiClass[] psiClasses = ApplicationManager.getApplication().runReadAction(new Computable() { @Override - public PsiClass compute() { - return JavaPsiFacade.getInstance(myProject).findClass(className, GlobalSearchScope.allScope(myProject)); + public PsiClass[] compute() { + return JavaPsiFacade.getInstance(myProject).findClasses(className, GlobalSearchScope.allScope(myProject)); } }); - if (psiClass instanceof KotlinLightClassForPackage) { - PsiElement element = psiClass.getNavigationElement(); - if (element instanceof JetFile) { - createBreakpoints((JetFile) element); - return; + for (PsiClass psiClass : psiClasses) { + if (psiClass instanceof KotlinLightClassForPackage) { + PsiElement element = psiClass.getNavigationElement(); + if (element instanceof JetFile) { + createBreakpoints((JetFile) element); + } + } + else { + createBreakpoints(psiClass.getContainingFile()); } } - - createBreakpoints(psiClass.getContainingFile()); } @SuppressWarnings("MethodMayBeStatic")