From 3237e54a346f20bfcfddedd367a88d8ef5941667 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Thu, 16 Oct 2025 15:34:15 +0200 Subject: [PATCH] [platform] refactoring: rename ContentModuleDescriptor.getModuleIdString to getModuleNameString for consistency (IJPL-206556) We use 'name' attribute in XML for it, and now the module ID is composed of the name and the namespace, so it would be confusing to use 'id' for 'name'. (cherry picked from commit dafa24422dbde094a63a57fd307721f6848ad26b) IJ-CR-178875 GitOrigin-RevId: 08280f7e484c97c8e3bc790f1ff22be66ed0e84f --- .../src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt | 2 +- .../core/src/com/intellij/driver/impl/Invoker.java | 2 +- .../performancePlugin/commands/RunServiceInPlugin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt index ed5178fde34c..a6ad7e6e7f04 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt @@ -622,7 +622,7 @@ class ContentModuleDescriptor( private val resourceBundleBaseName: String? = raw.resourceBundleBaseName /** java helper */ - fun getModuleIdString(): String = moduleId.name + fun getModuleNameString(): String = moduleId.name override fun getDescriptorPath(): String = descriptorPath diff --git a/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java b/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java index 9fc9c410ca2d..0290fe793576 100644 --- a/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java +++ b/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java @@ -440,7 +440,7 @@ public class Invoker implements InvokerMBean { List modules = IdeaPluginDescriptorImplKt.getContentModules((IdeaPluginDescriptorImpl)plugin); for (var module : modules) { - if (Objects.equals(moduleId, module.getModuleIdString())) { + if (Objects.equals(moduleId, module.getModuleNameString())) { return requireNonNull(module.getPluginClassLoader()); } } diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java index 6aef2a56f31b..ceb85fc9881e 100644 --- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java +++ b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java @@ -33,7 +33,7 @@ public class RunServiceInPlugin extends RunClassInPlugin { List modules = IdeaPluginDescriptorImplKt.getContentModules((IdeaPluginDescriptorImpl)plugin); if (!modules.isEmpty()) { for (var module : modules) { - if (myClazzName.contains(module.getModuleIdString())) { + if (myClazzName.contains(module.getModuleNameString())) { loader = module.getClassLoader(); } }