azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix KotlinEvaluateExpressionTestGenerated:testSimple

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-10-17 10:36:31 +04:00
parent ec63394121
commit 6bf0152f6d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
+12 -12
View File
@@ -44,9 +44,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription;
import org.jetbrains.jet.testing.ConfigLibraryUtil; import org.jetbrains.jet.testing.ConfigLibraryUtil;
import org.jetbrains.jet.utils.PathUtil;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@@ -183,22 +181,24 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
@Override @Override
protected void createBreakpoints(final String className) { protected void createBreakpoints(final String className) {
PsiClass psiClass = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() { PsiClass[] psiClasses = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass[]>() {
@Override @Override
public PsiClass compute() { public PsiClass[] compute() {
return JavaPsiFacade.getInstance(myProject).findClass(className, GlobalSearchScope.allScope(myProject)); return JavaPsiFacade.getInstance(myProject).findClasses(className, GlobalSearchScope.allScope(myProject));
} }
}); });
if (psiClass instanceof KotlinLightClassForPackage) { for (PsiClass psiClass : psiClasses) {
PsiElement element = psiClass.getNavigationElement(); if (psiClass instanceof KotlinLightClassForPackage) {
if (element instanceof JetFile) { PsiElement element = psiClass.getNavigationElement();
createBreakpoints((JetFile) element); if (element instanceof JetFile) {
return; createBreakpoints((JetFile) element);
}
}
else {
createBreakpoints(psiClass.getContainingFile());
} }
} }
createBreakpoints(psiClass.getContainingFile());
} }
@SuppressWarnings("MethodMayBeStatic") @SuppressWarnings("MethodMayBeStatic")