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

Minor: remove warnings and reformat KotlinDebuggerTestCase.java

Browse Source
This commit is contained in:
Nikolay Krasko
2017-06-09 17:25:09 +03:00
parent a4f6b17559
commit b0c82aac6a
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
+13 -23
View File
@@ -38,7 +38,6 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.EdtTestUtil;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.util.ThrowableRunnable;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.xdebugger.XDebugSession;
import kotlin.io.FilesKt;
@@ -207,12 +206,9 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
NoStrataPositionManagerHelperKt.setEmulateDexDebugInTests(false);
}
EdtTestUtil.runInEdtAndWait(new ThrowableRunnable<Throwable>() {
@Override
public void run() throws Throwable {
ConfigLibraryUtil.removeLibrary(getModule(), CUSTOM_LIBRARY_NAME);
ConfigLibraryUtil.removeLibrary(getModule(), KOTLIN_LIBRARY_NAME);
}
EdtTestUtil.runInEdtAndWait(() -> {
ConfigLibraryUtil.removeLibrary(getModule(), CUSTOM_LIBRARY_NAME);
ConfigLibraryUtil.removeLibrary(getModule(), KOTLIN_LIBRARY_NAME);
});
super.tearDown();
@@ -264,19 +260,16 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
CompilerUtil.refreshOutputRoots(Lists.newArrayList(outputDirPath));
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
ModifiableRootModel model = ModuleRootManager.getInstance(myModule).getModifiableModel();
configureLibrary(model, CUSTOM_LIBRARY_NAME, CUSTOM_LIBRARY_JAR, CUSTOM_LIBRARY_SOURCES);
configureLibrary(model, KOTLIN_LIBRARY_NAME, ForTestCompileRuntime.runtimeJarForTests(), new File("libraries/stdlib/src"));
model.commit();
}
ApplicationManager.getApplication().runWriteAction(() -> {
ModifiableRootModel model = ModuleRootManager.getInstance(myModule).getModifiableModel();
configureLibrary(model, CUSTOM_LIBRARY_NAME, CUSTOM_LIBRARY_JAR, CUSTOM_LIBRARY_SOURCES);
configureLibrary(model, KOTLIN_LIBRARY_NAME, ForTestCompileRuntime.runtimeJarForTests(), new File("libraries/stdlib/src"));
model.commit();
});
}
private static List<File> findJavaFiles(@NotNull File directory) {
List<File> result = new ArrayList<File>();
List<File> result = new ArrayList<>();
if (directory.isDirectory()) {
File[] files = directory.listFiles();
if (files != null) {
@@ -302,13 +295,10 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
}
@Override
protected void createBreakpoints(final String className) {
PsiClass[] psiClasses = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass[]>() {
@Override
public PsiClass[] compute() {
return JavaPsiFacade.getInstance(myProject).findClasses(className, GlobalSearchScope.allScope(myProject));
}
});
protected void createBreakpoints(String className) {
PsiClass[] psiClasses = ApplicationManager.getApplication().runReadAction(
(Computable<PsiClass[]>) () -> JavaPsiFacade.getInstance(myProject)
.findClasses(className, GlobalSearchScope.allScope(myProject)));
for (PsiClass psiClass : psiClasses) {
if (psiClass instanceof KtLightClassForFacade) {