From f68ef66b572fd22346a3e2255f256f6e1caeae88 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Mon, 24 Jun 2024 12:16:49 +0200 Subject: [PATCH] [rdct] rename modules in the remote-dev part accordingly to the new naming schema (RDCT-1417) The following conventions are now used: * modules with frontend functionality have the 'frontend' word in their names; * modules with backend functionality have the 'backend' word in their names; * modules used when running backend and frontend in separate processes only have the 'split' word in their names. `integrity of non-standard root packages list` test is temporarily commented to avoid merge conflicts. GitOrigin-RevId: 67487ef9224d3007eb7aff6f3a4c9fd3fe848e5f --- .../com/intellij/tools/launch/ide/splitMode/IdeConstants.kt | 2 +- .../intellij/build/images/IntellijIconClassGeneratorConfig.kt | 4 ++++ .../src/org/jetbrains/intellij/build/autoLayout.kt | 2 +- .../testSrc/com/intellij/ide/plugins/PluginModelValidator.kt | 2 +- .../intellij/remoteDev/downloader/EmbeddedClientLauncher.kt | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/launch/src/com/intellij/tools/launch/ide/splitMode/IdeConstants.kt b/build/launch/src/com/intellij/tools/launch/ide/splitMode/IdeConstants.kt index 7eebb9e7798c..10e3b1eb769e 100644 --- a/build/launch/src/com/intellij/tools/launch/ide/splitMode/IdeConstants.kt +++ b/build/launch/src/com/intellij/tools/launch/ide/splitMode/IdeConstants.kt @@ -14,7 +14,7 @@ internal object IdeConstants { /** * See `com.jetbrains.rdct.testFramework.launch.ProcessLauncher.GATEWAY_PLUGIN_MODULE` */ - const val INTELLIJ_CWM_GUEST_MAIN_MODULE = "intellij.cwm.guest.main" + const val INTELLIJ_CWM_GUEST_MAIN_MODULE = "intellij.platform.frontend.split.main" const val INTELLIJ_IDEA_ULTIMATE_MAIN_MODULE = "intellij.idea.ultimate.main" const val GATEWAY_PLUGIN_MODULE = "intellij.gateway.plugin" diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt index 4dc4412a2c4d..e382bafd3e84 100644 --- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt +++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt @@ -26,6 +26,10 @@ class IntellijIconClassGeneratorConfig : IconClasses() { packageName = "com.intellij.lang.css", iconDirectory = "icons/css", ) + "intellij.platform.split" -> IntellijIconClassGeneratorModuleConfig( + className = "CwmCommonIcons", + packageName = "com.intellij.cwm.common.icons", + ) "intellij.properties.psi" -> IntellijIconClassGeneratorModuleConfig( className = "PropertiesIcons", packageName = "com.intellij.lang.properties", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/autoLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/autoLayout.kt index a0c1dca79130..5661b5ab960b 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/autoLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/autoLayout.kt @@ -65,7 +65,7 @@ internal suspend fun computeModuleSourcesByContent( ) { for (moduleName in helper.readPluginContentFromDescriptor(context.findRequiredModule(layout.mainModule), jarPackager.moduleOutputPatcher)) { // CWM plugin is overcomplicated without any valid reason - it must be refactored - if (moduleName == "intellij.cwm.plugin.driver" || !addedModules.add(moduleName)) { + if (moduleName == "intellij.driver.backend.split" || !addedModules.add(moduleName)) { continue } diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt index 01b81e1cb207..8187d8697aa6 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt @@ -548,7 +548,7 @@ class PluginModelValidator(sourceModules: List) { } val pluginFileName = when (moduleName) { - "intellij.cwm.host" -> "pluginBase.xml" + "intellij.platform.backend.split" -> "pluginBase.xml" "intellij.idea.community.customization" -> "IdeaPlugin.xml" else -> "plugin.xml" } diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/EmbeddedClientLauncher.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/EmbeddedClientLauncher.kt index 80a2a2acd6f0..7a1d53893a5a 100644 --- a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/EmbeddedClientLauncher.kt +++ b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/EmbeddedClientLauncher.kt @@ -74,7 +74,7 @@ class EmbeddedClientLauncher private constructor(private val moduleRepository: R PlatformUtils.WEB_PREFIX -> RuntimeModuleId.module("intellij.webstorm.frontend") PlatformUtils.RUBY_PREFIX -> RuntimeModuleId.module("intellij.rubymine.frontend") PlatformUtils.RUSTROVER_PREFIX -> RuntimeModuleId.module("intellij.rustrover.frontend") - else -> RuntimeModuleId.module("intellij.cwm.guest") + else -> RuntimeModuleId.module("intellij.platform.frontend.split") } }