From 1843fbcf1cfd6a3e2c5345c3c8f9114e18dbf210 Mon Sep 17 00:00:00 2001 From: Andrey Lisin Date: Fri, 2 Aug 2024 11:20:00 +0200 Subject: [PATCH] Cleanup: remove redundant usage of AppUIExecutor GitOrigin-RevId: c81a918fe0916a8178e14ee15879bc590706f02b --- .../python/debugger/PyDebugRunner.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/python/src/com/jetbrains/python/debugger/PyDebugRunner.java b/python/src/com/jetbrains/python/debugger/PyDebugRunner.java index 46f811ef85d5..0a94596d4a30 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebugRunner.java +++ b/python/src/com/jetbrains/python/debugger/PyDebugRunner.java @@ -41,6 +41,7 @@ import com.intellij.openapi.util.registry.RegistryManager; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ExperimentalUI; +import com.intellij.util.concurrency.annotations.RequiresEdt; import com.intellij.util.net.NetUtils; import com.intellij.xdebugger.XDebugProcess; import com.intellij.xdebugger.XDebugProcessStarter; @@ -148,21 +149,19 @@ public class PyDebugRunner implements ProgramRunner { return false; } + @RequiresEdt protected Promise<@NotNull XDebugSession> createSession(@NotNull RunProfileState state, final @NotNull ExecutionEnvironment environment) { - return AppUIExecutor.onUiThread() - .submit(FileDocumentManager.getInstance()::saveAllDocuments) - .thenAsync(ignored -> { - if (Registry.is("python.use.targets.api")) { - return createSessionUsingTargetsApi(state, environment); - } - if (PyRunnerUtil.isTargetBasedSdkAssigned(state)) { - Project project = environment.getProject(); - Module module = PyRunnerUtil.getModule(state); - throw new RuntimeExceptionWithHyperlink(PyBundle.message("runcfg.error.message.python.interpreter.is.invalid.configure"), - () -> showPythonInterpreterSettings(project, module)); - } - return createSessionLegacy(state, environment); - }); + FileDocumentManager.getInstance().saveAllDocuments(); + if (Registry.is("python.use.targets.api")) { + return createSessionUsingTargetsApi(state, environment); + } + if (PyRunnerUtil.isTargetBasedSdkAssigned(state)) { + Project project = environment.getProject(); + Module module = PyRunnerUtil.getModule(state); + throw new RuntimeExceptionWithHyperlink(PyBundle.message("runcfg.error.message.python.interpreter.is.invalid.configure"), + () -> showPythonInterpreterSettings(project, module)); + } + return createSessionLegacy(state, environment); } private @NotNull Promise createSessionUsingTargetsApi(@NotNull RunProfileState state,