diff --git a/.idea/modules.xml b/.idea/modules.xml index 8aaf628f5f20..65567e9e2adb 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -639,10 +639,10 @@ - - - - + + + + diff --git a/platform/elevation/intellij.execution.process.elevation.iml b/platform/execution-process-elevation/intellij.execution.process.elevation.iml similarity index 100% rename from platform/elevation/intellij.execution.process.elevation.iml rename to platform/execution-process-elevation/intellij.execution.process.elevation.iml diff --git a/platform/elevation/resources/messages/ElevationBundle.properties b/platform/execution-process-elevation/resources/messages/ElevationBundle.properties similarity index 100% rename from platform/elevation/resources/messages/ElevationBundle.properties rename to platform/execution-process-elevation/resources/messages/ElevationBundle.properties diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/ElevationDaemonProcessLauncher.kt b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationDaemonProcessLauncher.kt similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/ElevationDaemonProcessLauncher.kt rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationDaemonProcessLauncher.kt diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/ElevationLogger.kt b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationLogger.kt similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/ElevationLogger.kt rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationLogger.kt diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/ElevationServiceAvailabilityImpl.kt b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationServiceAvailabilityImpl.kt similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/ElevationServiceAvailabilityImpl.kt rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationServiceAvailabilityImpl.kt diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/ElevationServiceImpl.kt b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationServiceImpl.kt similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/ElevationServiceImpl.kt rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/ElevationServiceImpl.kt diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettings.kt b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettings.kt similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettings.kt rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettings.kt diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettingsConfigurable.kt b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettingsConfigurable.kt similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettingsConfigurable.kt rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/settings/ElevationSettingsConfigurable.kt diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/settings/ExplanatoryTextUiUtil.kt b/platform/execution-process-elevation/src/com/intellij/execution/process/elevation/settings/ExplanatoryTextUiUtil.kt similarity index 100% rename from platform/elevation/src/com/intellij/execution/process/elevation/settings/ExplanatoryTextUiUtil.kt rename to platform/execution-process-elevation/src/com/intellij/execution/process/elevation/settings/ExplanatoryTextUiUtil.kt diff --git a/platform/elevation/client/intellij.execution.process.mediator.client.iml b/platform/execution-process-mediator/client/intellij.execution.process.mediator.client.iml similarity index 100% rename from platform/elevation/client/intellij.execution.process.mediator.client.iml rename to platform/execution-process-mediator/client/intellij.execution.process.mediator.client.iml diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/MediatedProcess.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/MediatedProcess.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/MediatedProcess.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/MediatedProcess.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/MediatedProcessHandler.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/MediatedProcessHandler.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/MediatedProcessHandler.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/MediatedProcessHandler.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorClient.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorClient.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorClient.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorClient.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorLogger.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorLogger.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorLogger.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/ProcessMediatorLogger.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/grpc/LoggingClientInterceptor.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/grpc/LoggingClientInterceptor.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/grpc/LoggingClientInterceptor.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/grpc/LoggingClientInterceptor.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonHandshakeTransport.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonHandshakeTransport.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonHandshakeTransport.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonHandshakeTransport.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonProcessLauncher.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonProcessLauncher.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonProcessLauncher.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/DaemonProcessLauncher.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnection.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnection.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnection.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnection.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnectionManager.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnectionManager.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnectionManager.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnectionManager.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/util/ChannelInputStream.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/util/ChannelInputStream.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/util/ChannelInputStream.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/util/ChannelInputStream.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/util/ChannelOutputStream.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/util/ChannelOutputStream.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/util/ChannelOutputStream.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/util/ChannelOutputStream.kt diff --git a/platform/elevation/client/src/com/intellij/execution/process/mediator/client/util/coroutineUtil.kt b/platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/util/coroutineUtil.kt similarity index 100% rename from platform/elevation/client/src/com/intellij/execution/process/mediator/client/util/coroutineUtil.kt rename to platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/util/coroutineUtil.kt diff --git a/platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorLauncherTest.kt b/platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorLauncherTest.kt similarity index 100% rename from platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorLauncherTest.kt rename to platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorLauncherTest.kt diff --git a/platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorTest.kt b/platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorTest.kt similarity index 100% rename from platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorTest.kt rename to platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/ProcessMediatorTest.kt diff --git a/platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/rt/MediatedProcessTestMain.kt b/platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/rt/MediatedProcessTestMain.kt similarity index 100% rename from platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/rt/MediatedProcessTestMain.kt rename to platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/rt/MediatedProcessTestMain.kt diff --git a/platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/testUtil.kt b/platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/testUtil.kt similarity index 100% rename from platform/elevation/client/testSrc/com/intellij/execution/process/mediator/client/testUtil.kt rename to platform/execution-process-mediator/client/testSrc/com/intellij/execution/process/mediator/client/testUtil.kt diff --git a/platform/elevation/common/.gitignore b/platform/execution-process-mediator/common/.gitignore similarity index 100% rename from platform/elevation/common/.gitignore rename to platform/execution-process-mediator/common/.gitignore diff --git a/platform/elevation/common/build.gradle.kts b/platform/execution-process-mediator/common/build.gradle.kts similarity index 100% rename from platform/elevation/common/build.gradle.kts rename to platform/execution-process-mediator/common/build.gradle.kts diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReply.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReply.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReply.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReply.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReplyOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReplyOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReplyOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationReplyOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequest.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequest.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequest.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequest.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequestOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequestOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequestOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/AwaitTerminationRequestOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLine.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLine.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLine.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLine.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLineOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLineOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLineOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CommandLineOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReply.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReply.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReply.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReply.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReplyOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReplyOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReplyOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessReplyOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequest.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequest.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequest.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequest.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequestOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequestOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequestOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/CreateProcessRequestOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DaemonGrpc.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DaemonGrpc.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DaemonGrpc.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DaemonGrpc.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunk.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunk.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunk.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunk.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunkOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunkOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunkOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DataChunkOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequest.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequest.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequest.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequest.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequestOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequestOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequestOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/DestroyProcessRequestOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandle.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandle.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandle.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandle.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandleOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandleOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandleOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/FileHandleOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/Handshake.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/Handshake.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/Handshake.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/Handshake.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/HandshakeOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/HandshakeOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/HandshakeOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/HandshakeOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReply.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReply.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReply.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReply.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReplyOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReplyOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReplyOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/OpenHandleReplyOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessManagerGrpc.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessManagerGrpc.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessManagerGrpc.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessManagerGrpc.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProto.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProto.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProto.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProto.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProtoGrpcKt.kt b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProtoGrpcKt.kt similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProtoGrpcKt.kt rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ProcessMediatorProtoGrpcKt.kt diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptions.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptions.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptions.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptions.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptionsOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptionsOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptionsOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaOptionsOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaState.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaState.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaState.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaState.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActive.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActive.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActive.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActive.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActiveOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActiveOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActiveOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateActiveOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/QuotaStateOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequest.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequest.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequest.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequest.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequestOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequestOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequestOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/ReadStreamRequestOrBuilder.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequest.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequest.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequest.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequest.java diff --git a/platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequestOrBuilder.java b/platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequestOrBuilder.java similarity index 100% rename from platform/elevation/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequestOrBuilder.java rename to platform/execution-process-mediator/common/gen/com/intellij/execution/process/mediator/common/rpc/WriteStreamRequestOrBuilder.java diff --git a/platform/elevation/common/gradle/wrapper/gradle-wrapper.jar b/platform/execution-process-mediator/common/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from platform/elevation/common/gradle/wrapper/gradle-wrapper.jar rename to platform/execution-process-mediator/common/gradle/wrapper/gradle-wrapper.jar diff --git a/platform/elevation/common/gradle/wrapper/gradle-wrapper.properties b/platform/execution-process-mediator/common/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from platform/elevation/common/gradle/wrapper/gradle-wrapper.properties rename to platform/execution-process-mediator/common/gradle/wrapper/gradle-wrapper.properties diff --git a/platform/elevation/common/gradlew b/platform/execution-process-mediator/common/gradlew similarity index 100% rename from platform/elevation/common/gradlew rename to platform/execution-process-mediator/common/gradlew diff --git a/platform/elevation/common/gradlew.bat b/platform/execution-process-mediator/common/gradlew.bat similarity index 100% rename from platform/elevation/common/gradlew.bat rename to platform/execution-process-mediator/common/gradlew.bat diff --git a/platform/elevation/common/intellij.execution.process.mediator.common.iml b/platform/execution-process-mediator/common/intellij.execution.process.mediator.common.iml similarity index 100% rename from platform/elevation/common/intellij.execution.process.mediator.common.iml rename to platform/execution-process-mediator/common/intellij.execution.process.mediator.common.iml diff --git a/platform/elevation/common/proto/processMediator.proto b/platform/execution-process-mediator/common/proto/processMediator.proto similarity index 100% rename from platform/elevation/common/proto/processMediator.proto rename to platform/execution-process-mediator/common/proto/processMediator.proto diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/DaemonClientCredentials.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/DaemonClientCredentials.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/DaemonClientCredentials.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/DaemonClientCredentials.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/DaemonLaunchOptions.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/DaemonLaunchOptions.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/DaemonLaunchOptions.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/DaemonLaunchOptions.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/QuotaExceededException.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/QuotaExceededException.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/QuotaExceededException.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/QuotaExceededException.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/QuotaOptions.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/QuotaOptions.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/QuotaOptions.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/QuotaOptions.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/QuotaState.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/QuotaState.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/QuotaState.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/QuotaState.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatus.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatus.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatus.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatus.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/rpc/conversion.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/rpc/conversion.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/rpc/conversion.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/rpc/conversion.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/util/argparser.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/util/argparser.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/util/argparser.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/util/argparser.kt diff --git a/platform/elevation/common/src/com/intellij/execution/process/mediator/common/util/rsaUtil.kt b/platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/util/rsaUtil.kt similarity index 100% rename from platform/elevation/common/src/com/intellij/execution/process/mediator/common/util/rsaUtil.kt rename to platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/util/rsaUtil.kt diff --git a/platform/elevation/common/testSrc/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatusTest.kt b/platform/execution-process-mediator/common/testSrc/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatusTest.kt similarity index 100% rename from platform/elevation/common/testSrc/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatusTest.kt rename to platform/execution-process-mediator/common/testSrc/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatusTest.kt diff --git a/platform/elevation/common/testSrc/com/intellij/execution/process/mediator/common/util/ParseArgsTest.kt b/platform/execution-process-mediator/common/testSrc/com/intellij/execution/process/mediator/common/util/ParseArgsTest.kt similarity index 100% rename from platform/elevation/common/testSrc/com/intellij/execution/process/mediator/common/util/ParseArgsTest.kt rename to platform/execution-process-mediator/common/testSrc/com/intellij/execution/process/mediator/common/util/ParseArgsTest.kt diff --git a/platform/elevation/daemon/intellij.execution.process.mediator.daemon.iml b/platform/execution-process-mediator/daemon/intellij.execution.process.mediator.daemon.iml similarity index 100% rename from platform/elevation/daemon/intellij.execution.process.mediator.daemon.iml rename to platform/execution-process-mediator/daemon/intellij.execution.process.mediator.daemon.iml diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessMain.kt b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessMain.kt similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessMain.kt rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessMain.kt diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessRuntimeClasspath.java b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessRuntimeClasspath.java similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessRuntimeClasspath.java rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/DaemonProcessRuntimeClasspath.java diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManager.kt b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManager.kt similarity index 97% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManager.kt rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManager.kt index c8fdc508fbd1..9cf3c48db02c 100644 --- a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManager.kt +++ b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManager.kt @@ -7,7 +7,10 @@ import com.intellij.execution.process.mediator.daemon.FdConstants.STDIN import com.intellij.execution.process.mediator.daemon.FdConstants.STDOUT import kotlinx.coroutines.* import kotlinx.coroutines.channels.SendChannel -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.future.await import java.io.Closeable import java.io.File diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManagerServerService.kt b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManagerServerService.kt similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManagerServerService.kt rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessManagerServerService.kt diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessMediatorServerDaemon.kt b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessMediatorServerDaemon.kt similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessMediatorServerDaemon.kt rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/ProcessMediatorServerDaemon.kt diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/QuotaManager.kt b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/QuotaManager.kt similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/QuotaManager.kt rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/QuotaManager.kt diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/CredentialsAuthServerInterceptor.kt b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/CredentialsAuthServerInterceptor.kt similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/CredentialsAuthServerInterceptor.kt rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/CredentialsAuthServerInterceptor.kt diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/ExceptionStatusDescriptionAugmenterServerInterceptor.kt b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/ExceptionStatusDescriptionAugmenterServerInterceptor.kt similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/ExceptionStatusDescriptionAugmenterServerInterceptor.kt rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/grpc/ExceptionStatusDescriptionAugmenterServerInterceptor.kt diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/util/MachUtil.java b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/util/MachUtil.java similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/util/MachUtil.java rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/util/MachUtil.java diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/util/NativeCall.java b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/util/NativeCall.java similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/util/NativeCall.java rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/util/NativeCall.java diff --git a/platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/util/UnixUtil.java b/platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/util/UnixUtil.java similarity index 100% rename from platform/elevation/daemon/src/com/intellij/execution/process/mediator/daemon/util/UnixUtil.java rename to platform/execution-process-mediator/daemon/src/com/intellij/execution/process/mediator/daemon/util/UnixUtil.java