diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java index 911f7672ceec..48fa47c0801e 100644 --- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java +++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java @@ -12,7 +12,7 @@ import com.intellij.execution.process.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.target.*; -import com.intellij.execution.target.eel.EelTargetEnvironmentRequest; +import com.intellij.execution.target.EelTargetEnvironmentRequest; import com.intellij.execution.target.local.LocalTargetEnvironment; import com.intellij.execution.testDiscovery.JvmToggleAutoTestAction; import com.intellij.execution.testframework.*; 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 6201d1d15da7..f9d1615e263a 100644 --- a/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java +++ b/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java @@ -8,7 +8,7 @@ import com.intellij.execution.TargetDebuggerConnectionUtil; import com.intellij.execution.process.OSProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.target.*; -import com.intellij.execution.target.eel.EelTargetEnvironmentRequest; +import com.intellij.execution.target.EelTargetEnvironmentRequest; import com.intellij.execution.target.java.JavaLanguageRuntimeConfiguration; import com.intellij.execution.target.local.LocalTargetEnvironment; import com.intellij.execution.target.local.LocalTargetEnvironmentRequest; diff --git a/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml b/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml index 1e7483bc6bf9..8b73c6a0b018 100644 --- a/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml +++ b/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml @@ -82,7 +82,7 @@ serviceImplementation="com.intellij.ide.ui.experimental.toolbar.RunWidgetAvailabilityManager"/> - + diff --git a/platform/execution/BUILD.bazel b/platform/execution/BUILD.bazel index b498d5841af4..b12421ebe0b1 100644 --- a/platform/execution/BUILD.bazel +++ b/platform/execution/BUILD.bazel @@ -31,6 +31,8 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "//platform/util/coroutines", "//platform/kernel/shared:kernel", + "//platform/eel", + "//platform/eel-provider", ], runtime_deps = [":execution_resources"] ) diff --git a/platform/execution/intellij.platform.execution.iml b/platform/execution/intellij.platform.execution.iml index ad5d104f3122..79e78acd21f6 100644 --- a/platform/execution/intellij.platform.execution.iml +++ b/platform/execution/intellij.platform.execution.iml @@ -49,5 +49,7 @@ + + \ No newline at end of file diff --git a/platform/execution-impl/src/com/intellij/execution/target/eel/EelTargetEnvironmentRequest.kt b/platform/execution/src/com/intellij/execution/target/EelTargetEnvironmentRequest.kt similarity index 98% rename from platform/execution-impl/src/com/intellij/execution/target/eel/EelTargetEnvironmentRequest.kt rename to platform/execution/src/com/intellij/execution/target/EelTargetEnvironmentRequest.kt index adcb3a89e8a8..4fae132a4597 100644 --- a/platform/execution-impl/src/com/intellij/execution/target/eel/EelTargetEnvironmentRequest.kt +++ b/platform/execution/src/com/intellij/execution/target/EelTargetEnvironmentRequest.kt @@ -1,8 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.execution.target.eel +package com.intellij.execution.target import com.intellij.execution.Platform -import com.intellij.execution.target.* import com.intellij.openapi.components.PersistentStateComponent import com.intellij.openapi.components.Service import com.intellij.openapi.components.service @@ -31,6 +30,7 @@ import org.jetbrains.annotations.ApiStatus import java.net.InetSocketAddress import java.net.Socket import java.nio.file.Files +import java.nio.file.NoSuchFileException import java.nio.file.Path import java.util.* import java.util.concurrent.ConcurrentHashMap @@ -200,7 +200,7 @@ private class EelTargetEnvironment(override val request: EelTargetEnvironmentReq try { if (from.isSameFileAs(to)) return } - catch (err: java.nio.file.NoSuchFileException) { + catch (err: NoSuchFileException) { if (!Files.exists(from)) throw err } // TODO: generalize com.intellij.execution.wsl.ijent.nio.IjentWslNioFileSystemProvider.copy @@ -213,7 +213,7 @@ private class EelTargetEnvironment(override val request: EelTargetEnvironmentReq try { if (from.isSameFileAs(to)) return } - catch (err: java.nio.file.NoSuchFileException) { + catch (err: NoSuchFileException) { if (!Files.exists(from)) throw err } // TODO: generalize com.intellij.execution.wsl.ijent.nio.IjentWslNioFileSystemProvider.copy diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java index 13dd126b29e9..5190662b722f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java @@ -7,7 +7,7 @@ import com.intellij.execution.configurations.JavaCommandLineState; import com.intellij.execution.configurations.SimpleJavaParameters; import com.intellij.execution.process.*; import com.intellij.execution.target.*; -import com.intellij.execution.target.eel.EelTargetEnvironmentRequest; +import com.intellij.execution.target.EelTargetEnvironmentRequest; import com.intellij.execution.target.local.LocalTargetEnvironmentRequest; import com.intellij.execution.testframework.Printable; import com.intellij.execution.testframework.Printer; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt index e941b4efd0fd..a04b23c5ea3a 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt @@ -3,7 +3,7 @@ package org.jetbrains.plugins.gradle.service.execution.eel import com.intellij.execution.target.HostPort import com.intellij.execution.target.TargetEnvironmentConfiguration -import com.intellij.execution.target.eel.EelTargetEnvironmentRequest +import com.intellij.execution.target.EelTargetEnvironmentRequest import com.intellij.openapi.progress.runBlockingCancellable import com.intellij.openapi.project.Project import com.intellij.openapi.util.io.toCanonicalPath diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java index 6d65d6bc7395..6bb1c9a9c860 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java @@ -11,7 +11,7 @@ import com.intellij.execution.process.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.target.*; -import com.intellij.execution.target.eel.EelTargetEnvironmentRequest; +import com.intellij.execution.target.EelTargetEnvironmentRequest; import com.intellij.execution.target.local.LocalTargetEnvironment; import com.intellij.execution.target.local.LocalTargetEnvironmentRequest; import com.intellij.execution.target.value.TargetEnvironmentFunctions; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenTargetShCommandLineState.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenTargetShCommandLineState.java index ad1577e0769b..6ca444c46d36 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenTargetShCommandLineState.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenTargetShCommandLineState.java @@ -14,7 +14,7 @@ import com.intellij.execution.process.ProcessTerminatedListener; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.target.*; -import com.intellij.execution.target.eel.EelTargetEnvironmentRequest; +import com.intellij.execution.target.EelTargetEnvironmentRequest; import com.intellij.execution.target.value.TargetEnvironmentFunctions; import com.intellij.execution.testDiscovery.JvmToggleAutoTestAction; import com.intellij.execution.ui.ConsoleView;