From 1f7b08bfc65767b6db0c1c0af9aad10277d0797e Mon Sep 17 00:00:00 2001 From: "alexey.afanasiev" Date: Thu, 30 Apr 2020 12:38:30 +0300 Subject: [PATCH] Move inspect starter from edt thread. Cleanup. GitOrigin-RevId: ca5a8127664004b5bfa934d4aea5a74e3019883e --- ...mandLineInspectionProjectConfigurator.java | 8 ++--- .../codeInspection/InspectionApplication.java | 30 +++++++++---------- ...mandLineInspectionProjectConfigurator.java | 13 ++++---- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/JavaCommandLineInspectionProjectConfigurator.java b/java/java-impl/src/com/intellij/codeInspection/JavaCommandLineInspectionProjectConfigurator.java index 2bf8bbeaf983..dc2b228b7404 100644 --- a/java/java-impl/src/com/intellij/codeInspection/JavaCommandLineInspectionProjectConfigurator.java +++ b/java/java-impl/src/com/intellij/codeInspection/JavaCommandLineInspectionProjectConfigurator.java @@ -3,7 +3,7 @@ package com.intellij.codeInspection; import com.intellij.ide.CommandLineInspectionProgressReporter; import com.intellij.ide.CommandLineInspectionProjectConfigurator; -import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.ProjectJdkTable; @@ -59,10 +59,8 @@ public class JavaCommandLineInspectionProjectConfigurator implements CommandLine String name = javaSdk.suggestSdkName(null, path); logger.reportMessage(2, "Detected JDK with name " + name + " at " + path); Sdk jdk = javaSdk.createJdk(name, path, false); - ApplicationManager.getApplication().invokeAndWait(() -> { - ApplicationManager.getApplication().runWriteAction( - () -> ProjectJdkTable.getInstance().addJdk(jdk)); - }); + + WriteAction.runAndWait(() -> ProjectJdkTable.getInstance().addJdk(jdk)); } } } diff --git a/platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java b/platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java index da12e55e9dd0..9781dc85311c 100644 --- a/platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java +++ b/platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java @@ -114,21 +114,21 @@ public final class InspectionApplication implements CommandLineInspectionProgres } public void execute() throws Exception { - final ApplicationInfoEx appInfo = (ApplicationInfoEx)ApplicationInfo.getInstance(); - reportMessageNoLineBreak(1, InspectionsBundle.message("inspection.application.starting.up", - appInfo.getFullApplicationName() + - " (build " + - appInfo.getBuild().asString() + - ")")); - reportMessage(1, InspectionsBundle.message("inspection.done")); + final ApplicationInfoEx appInfo = (ApplicationInfoEx)ApplicationInfo.getInstance(); + reportMessageNoLineBreak(1, InspectionsBundle.message("inspection.application.starting.up", + appInfo.getFullApplicationName() + + " (build " + + appInfo.getBuild().asString() + + ")")); + reportMessage(1, InspectionsBundle.message("inspection.done")); - Disposable disposable = Disposer.newDisposable(); - try { - run(Paths.get(FileUtil.toCanonicalPath(myProjectPath)), disposable); - } - finally { - Disposer.dispose(disposable); - } + Disposable disposable = Disposer.newDisposable(); + try { + run(Paths.get(FileUtil.toCanonicalPath(myProjectPath)), disposable); + } + finally { + Disposer.dispose(disposable); + } } private void printHelp() { @@ -177,8 +177,6 @@ public final class InspectionApplication implements CommandLineInspectionProgres myInspectionProfile = loadInspectionProfile(project); if (myInspectionProfile == null) return; - GlobalInspectionContextEx context = createGlobalInspectionContext(project); - final AnalysisScope scope; if (myAnalyzeChanges) { ChangeListManager changeListManager = ChangeListManager.getInstance(project); diff --git a/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java b/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java index 2e7591548ede..d0f9aad7e863 100644 --- a/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java +++ b/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java @@ -5,7 +5,7 @@ import com.intellij.analysis.AnalysisScope; import com.intellij.ide.CommandLineInspectionProgressReporter; import com.intellij.ide.CommandLineInspectionProjectConfigurator; import com.intellij.facet.FacetManager; -import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.fileTypes.FileTypeRegistry; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; @@ -62,12 +62,11 @@ public class PythonPluginCommandLineInspectionProjectConfigurator implements Com logger.reportMessage(3, sdk.getHomePath()); } final Sdk sdk = detectedSdks.get(0); - ApplicationManager.getApplication().invokeAndWait(() -> { - ApplicationManager.getApplication().runWriteAction(() -> { - logger.reportMessage(1, "Settings up interpreter " + sdk.getName()); - ProjectJdkTable.getInstance().addJdk(sdk); - }); + WriteAction.runAndWait(() -> { + logger.reportMessage(1, "Settings up interpreter " + sdk.getName()); + ProjectJdkTable.getInstance().addJdk(sdk); }); + PythonSdkUpdater.update(sdk, null, null, null); } else { @@ -88,7 +87,7 @@ public class PythonPluginCommandLineInspectionProjectConfigurator implements Com Module m = ModuleUtilCore.findModuleForFile(f, project); if (m != null && FacetManager.getInstance(m).getFacetByType(facetType.getId()) == null) { - ApplicationManager.getApplication().invokeAndWait(() -> { + WriteAction.runAndWait(() -> { FacetManager.getInstance(m).addFacet(facetType, facetType.getPresentableName(), null); }); }