MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gradle][wsl][IJ-CR-157253] Do not print a useless message about the start of a remote target execution

Browse Source 
(cherry picked from commit 3ee2cbc078047bdc8af41de3b5944c592538f877)

IJ-CR-157253

GitOrigin-RevId: fedd802c80213cdfaaa28c4d3fbed5869349f4c4
This commit is contained in:
Alexander.Glukhov
2025-03-11 11:58:59 +01:00
committed by intellij-monorepo-bot
parent 51c2be3b96
commit 30e07e487f
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/gradle/resources/messages/GradleBundle.properties
View File

@@ -205,7 +205,6 @@ gradle.target.run.label=Run Gradle task
gradle.target.execution.project.folder.label=Project folder:
gradle.target.execution.project.folder.title=Project Folder
gradle.target.execution.project.folder.description=The path on the target where the project sources is placed
gradle.target.execution.running=Running Gradle\u2026
gradle.target.configurable.home.path.label=Gradle home path:
gradle.target.configurable.home.path.title=Gradle Home Path
gradle.target.configurable.home.path.comment=The path to the Gradle installation on the target

32
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/target/GradleServerRunner.kt
View File

@@ -18,7 +18,6 @@ import com.intellij.openapi.progress.EmptyProgressIndicator
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Key
import com.intellij.openapi.util.NlsSafe
import com.intellij.util.PlatformUtils
import com.intellij.util.io.BaseOutputReader
import com.intellij.util.text.nullize
import org.gradle.initialization.BuildEventConsumer
@@ -32,10 +31,8 @@ import org.gradle.tooling.GradleConnectionException
import org.gradle.tooling.ResultHandler
import org.gradle.tooling.internal.consumer.parameters.ConsumerOperationParameters
import org.gradle.tooling.internal.provider.action.BuildActionSerializer
import org.jetbrains.annotations.Nls
import org.jetbrains.plugins.gradle.service.execution.GradleServerConfigurationProvider
import org.jetbrains.plugins.gradle.tooling.proxy.TargetBuildParameters
import org.jetbrains.plugins.gradle.util.GradleBundle
import java.io.ByteArrayInputStream
import java.net.InetAddress
import java.util.concurrent.Future
@@ -109,17 +106,8 @@ internal class GradleServerRunner(private val connection: TargetProjectConnectio
}
}
}
val appStartedMessage = if (connection.getUserData(targetPreparationKey) == true || PlatformUtils.isFleetBackend()) {
null
}
else {
connection.putUserData(targetPreparationKey, true)
GradleBundle.message("gradle.target.execution.running") + "\n"
}
processHandler.addProcessListener(
GradleServerProcessListener(appStartedMessage, targetProgressIndicator, resultHandler, gradleServerEventsListener)
)
val listener = GradleServerProcessListener(targetProgressIndicator, resultHandler, gradleServerEventsListener)
processHandler.addProcessListener(listener)
processHandler.runProcessWithProgressIndicator(targetProgressIndicator.progressIndicator, -1, true)
}
@@ -268,17 +256,18 @@ internal class GradleServerRunner(private val connection: TargetProjectConnectio
try {
lock.wait(100)
}
catch (ignore: InterruptedException) {
catch (_: InterruptedException) {
}
}
}
}
}
private class GradleServerProcessListener(private val appStartedMessage: @Nls String?,
private val targetProgressIndicator: TargetProgressIndicator,
private val resultHandler: ResultHandler<Any?>,
private val gradleServerEventsListener: GradleServerEventsListener) : ProcessListener {
private class GradleServerProcessListener(
private val targetProgressIndicator: TargetProgressIndicator,
private val resultHandler: ResultHandler<Any?>,
private val gradleServerEventsListener: GradleServerEventsListener,
) : ProcessListener {
@Volatile
private var connectionAddressReceived = false
@@ -297,10 +286,6 @@ internal class GradleServerRunner(private val connection: TargetProjectConnectio
}
}
override fun startNotified(event: ProcessEvent) {
appStartedMessage?.let { targetProgressIndicator.addText(it, ProcessOutputType.STDOUT) }
}
override fun processTerminated(event: ProcessEvent) {
if (!resultReceived) {
gradleServerEventsListener.waitForResult { resultReceived || targetProgressIndicator.isCanceled }
@@ -340,7 +325,6 @@ internal class GradleServerRunner(private val connection: TargetProjectConnectio
companion object {
private val log = logger<GradleServerRunner>()
private val targetPreparationKey = Key.create<Boolean>("target preparation key")
}
}