From 80f7ee2e2aac4c619f893a409e5a953aa988c5cc Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 7 Feb 2022 21:28:38 +0100 Subject: [PATCH] [java] [execution] don't request EDT during configuration start activities (IDEA-288068) GitOrigin-RevId: e58836a0b30ff021c38df9cf9266823799658a68 --- .../configurations/JavaCommandLineState.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java b/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java index ea05a0cdd80e..f148490b2e48 100644 --- a/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java +++ b/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.execution.configurations; import com.intellij.execution.ExecutionBundle; @@ -14,12 +14,9 @@ import com.intellij.execution.target.local.LocalTargetEnvironmentRequest; import com.intellij.execution.wsl.WslPath; import com.intellij.execution.wsl.target.WslTargetEnvironmentConfiguration; import com.intellij.execution.wsl.target.WslTargetEnvironmentRequest; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.Experiments; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; @@ -118,20 +115,7 @@ public abstract class JavaCommandLineState extends CommandLineState implements J shouldPrepareDebuggerConnection() ? TargetDebuggerConnectionUtil.prepareDebuggerConnection(this, request) : null; myTargetDebuggerConnection = targetDebuggerConnection; - Ref commandLineRef = new Ref<>(); - Ref exceptionRef = new Ref<>(); - ApplicationManager.getApplication().invokeAndWait(() -> { - try { - commandLineRef.set(createTargetedCommandLine(myTargetEnvironmentRequest)); - } - catch (ExecutionException e) { - exceptionRef.set(e); - } - }); - if(!exceptionRef.isNull()){ - throw exceptionRef.get(); - } - myCommandLine = commandLineRef.get(); + myCommandLine = createTargetedCommandLine(myTargetEnvironmentRequest); if (targetDebuggerConnection != null) { Objects.requireNonNull(request).getTargetPortBindings().add(targetDebuggerConnection.getDebuggerPortRequest());