From 9b0d2e5d13e32b1a4b3a34187d012157ed03a758 Mon Sep 17 00:00:00 2001 From: Milica Sladakovic Date: Fri, 15 Aug 2025 15:07:16 +0200 Subject: [PATCH] IJPL-184315 Rename `intellij.sh` to `intellij.sh.plugin` Removes the need for the bootstrap coroutine dependency and aligns with naming conventions for plugin aggregators. GitOrigin-RevId: 04ca08d543d8803b74e28ce511800ad0fad91fd5 --- .idea/modules.xml | 4 +-- BUILD.bazel | 4 +-- build/bazel-generated-file-list.txt | 2 +- docs/plugin-graph/plugin-graph.json | 10 +++---- intellij.idea.community.main.iml | 2 +- .../testData/cacheLoader/caseFive.json | 4 +-- .../testData/cacheLoader/caseSix.json | 4 +-- .../loader/JpsCompilationOutputLoaderTest.kt | 4 +-- .../intellij/build/BaseIdeaProperties.kt | 2 +- plugins/sh/copyright/BUILD.bazel | 2 +- .../copyright/intellij.sh.copyright.tests.iml | 2 +- plugins/sh/core/BUILD.bazel | 2 +- plugins/sh/core/intellij.sh.tests.iml | 2 +- plugins/sh/{ => plugin}/BUILD.bazel | 26 +++++++++---------- .../intellij.sh.plugin.iml} | 0 .../intellij.sh.plugin.main.iml} | 3 +-- plugins/sh/{ => plugin}/plugin-content.yaml | 4 +-- .../resources/META-INF/plugin.xml | 0 .../resources/META-INF/pluginIcon.svg | 0 .../resources/META-INF/pluginIcon_dark.svg | 0 plugins/terminal/tests/BUILD.bazel | 2 +- .../tests/intellij.terminal.tests.iml | 2 +- python/build/plugin-list.txt | 2 +- python/intellij.pycharm.community.main.iml | 2 +- 24 files changed, 41 insertions(+), 44 deletions(-) rename plugins/sh/{ => plugin}/BUILD.bazel (62%) rename plugins/sh/{intellij.sh.iml => plugin/intellij.sh.plugin.iml} (100%) rename plugins/sh/{intellij.sh.main.iml => plugin/intellij.sh.plugin.main.iml} (83%) rename plugins/sh/{ => plugin}/plugin-content.yaml (87%) rename plugins/sh/{ => plugin}/resources/META-INF/plugin.xml (100%) rename plugins/sh/{ => plugin}/resources/META-INF/pluginIcon.svg (100%) rename plugins/sh/{ => plugin}/resources/META-INF/pluginIcon_dark.svg (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 52afc37dafca..4a666f90dfe4 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1136,13 +1136,13 @@ - - + + diff --git a/BUILD.bazel b/BUILD.bazel index 05aec91ce013..1b3566410841 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -198,7 +198,7 @@ jvm_library( "//plugins/stream-debugger:java-debugger-streams", "@lib//:jgoodies-common", "//plugins/editorconfig:editorconfig-plugin-main", - "//plugins/sh:sh-main", + "//plugins/sh/plugin:plugin-main", "//plugins/terminal/sh", "//plugins/gradle-maven:gradle-java-maven", "//plugins/markdown/core:markdown", @@ -476,7 +476,7 @@ jvm_library( "//plugins/stream-debugger:java-debugger-streams", "@lib//:jgoodies-common", "//plugins/editorconfig:editorconfig-plugin-main", - "//plugins/sh:sh-main", + "//plugins/sh/plugin:plugin-main", "//plugins/terminal/sh", "//plugins/gradle-maven:gradle-java-maven", "//plugins/markdown/core:markdown", diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 70ba35f639e5..7ddc9663e241 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -1222,11 +1222,11 @@ plugins/search-everywhere-ml/ranking/yaml plugins/search-everywhere-ml/typos plugins/settings-repository plugins/settings-sync/jba -plugins/sh plugins/sh/backend plugins/sh/copyright plugins/sh/core plugins/sh/markdown +plugins/sh/plugin plugins/sh/python plugins/sh/terminal plugins/space/jps-plugin diff --git a/docs/plugin-graph/plugin-graph.json b/docs/plugin-graph/plugin-graph.json index cd68ccc04f22..51a1f6b5bbd6 100644 --- a/docs/plugin-graph/plugin-graph.json +++ b/docs/plugin-graph/plugin-graph.json @@ -2752,10 +2752,10 @@ "group": "nodes", "data": { "id": "v41", - "name": "intellij.sh", + "name": "intellij.sh.plugin", "n": "i.sh", - "package": "com.intellij.sh", - "sourceModule": "intellij.sh", + "package": "com.intellij.sh.plugin", + "sourceModule": "intellij.sh.plugin", "descriptor": "community/plugins/sh/resources/META-INF/plugin.xml", "pluginId": "com.jetbrains.sh", "parent": "cv41", @@ -2768,7 +2768,7 @@ "name": "intellij.sh/terminal", "n": "i.sh/terminal", "package": "com.intellij.sh.run.terminal", - "sourceModule": "intellij.sh", + "sourceModule": "intellij.sh.plugin", "descriptor": "community/plugins/sh/resources/intellij.sh.terminal.xml", "parent": "cv41", "type": 0 @@ -2780,7 +2780,7 @@ "name": "intellij.sh/copyright", "n": "i.sh/copyright", "package": "com.intellij.sh.copyright", - "sourceModule": "intellij.sh", + "sourceModule": "intellij.sh.plugin", "descriptor": "community/plugins/sh/resources/intellij.sh.copyright.xml", "parent": "cv41", "type": 0 diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index 7fca17ce7146..27213f321a6a 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -144,7 +144,7 @@ - + diff --git a/jps/jps-builders/testData/cacheLoader/caseFive.json b/jps/jps-builders/testData/cacheLoader/caseFive.json index 8fdff7c57891..bddf10e6cb05 100644 --- a/jps/jps-builders/testData/cacheLoader/caseFive.json +++ b/jps/jps-builders/testData/cacheLoader/caseFive.json @@ -22,9 +22,9 @@ "h": 8764333034314, "relativePath": "$BUILD_DIR$/production/intellij.cidr.externalSystem" }, - "intellij.sh": { + "intellij.sh.plugin": { "h": 8764333034314, - "relativePath": "$BUILD_DIR$/production/intellij.sh" + "relativePath": "$BUILD_DIR$/production/intellij.sh.plugin" } } } \ No newline at end of file diff --git a/jps/jps-builders/testData/cacheLoader/caseSix.json b/jps/jps-builders/testData/cacheLoader/caseSix.json index f444389f8c59..2e824e8e3ec2 100644 --- a/jps/jps-builders/testData/cacheLoader/caseSix.json +++ b/jps/jps-builders/testData/cacheLoader/caseSix.json @@ -22,9 +22,9 @@ "h": 8764333034314, "relativePath": "$BUILD_DIR$/production/intellij.cidr.externalSystem" }, - "intellij.sh": { + "intellij.sh.plugin": { "h": 8764333034314, - "relativePath": "$BUILD_DIR$/production/intellij.sh" + "relativePath": "$BUILD_DIR$/production/intellij.sh.plugin" } } } \ No newline at end of file diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt b/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt index 1399dcc8e94b..962107bb9b29 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt +++ b/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt @@ -72,7 +72,7 @@ class JpsCompilationOutputLoaderTest : BasePlatformTestCase() { assertThat(affectedModules).hasSize(1) val affectedModule = affectedModules[0] assertEquals("resources-production", affectedModule!!.type) - assertEquals("intellij.sh", affectedModule.name) + assertEquals("intellij.sh.plugin", affectedModule.name) } fun testTargetFolderNotExist() { @@ -82,7 +82,7 @@ class JpsCompilationOutputLoaderTest : BasePlatformTestCase() { val types = affectedModules.map { it.type } val names = affectedModules.map { it.name } UsefulTestCase.assertSameElements(types, "java-test", "production", "resources-test", "resources-production") - UsefulTestCase.assertSameElements(names, "intellij.cidr.externalSystem", "intellij.platform.ssh.integrationTests", "intellij.sh") + UsefulTestCase.assertSameElements(names, "intellij.cidr.externalSystem", "intellij.platform.ssh.integrationTests", "intellij.sh.plugin") } fun testChangedTest() { diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt index 9bca885e326a..b795435d9002 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt @@ -49,7 +49,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList = DEFAULT_BUNDLED_PLUGINS + seq "intellij.eclipse", "intellij.platform.langInjection.plugin", "intellij.java.debugger.streams", - "intellij.sh", + "intellij.sh.plugin", "intellij.markdown", "intellij.mcpserver", "intellij.webp", diff --git a/plugins/sh/copyright/BUILD.bazel b/plugins/sh/copyright/BUILD.bazel index 5123a3cee54e..76bc670bbcc8 100644 --- a/plugins/sh/copyright/BUILD.bazel +++ b/plugins/sh/copyright/BUILD.bazel @@ -36,7 +36,7 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/projectModel-api:projectModel", - "//plugins/sh:sh-main", + "//plugins/sh/plugin:plugin-main", "//plugins/copyright", "//plugins/copyright:copyright_test_lib", "//platform/projectModel-impl", diff --git a/plugins/sh/copyright/intellij.sh.copyright.tests.iml b/plugins/sh/copyright/intellij.sh.copyright.tests.iml index d70f1ca43c92..ea8c7c31b3f5 100644 --- a/plugins/sh/copyright/intellij.sh.copyright.tests.iml +++ b/plugins/sh/copyright/intellij.sh.copyright.tests.iml @@ -9,7 +9,7 @@ - + diff --git a/plugins/sh/core/BUILD.bazel b/plugins/sh/core/BUILD.bazel index c5b0e2069ca3..be16714a65a1 100644 --- a/plugins/sh/core/BUILD.bazel +++ b/plugins/sh/core/BUILD.bazel @@ -52,7 +52,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//plugins/sh/core", "//plugins/sh/backend", - "//plugins/sh:sh-main", + "//plugins/sh/plugin:plugin-main", "//spellchecker", "//spellchecker:spellchecker_test_lib", "//platform/testFramework", diff --git a/plugins/sh/core/intellij.sh.tests.iml b/plugins/sh/core/intellij.sh.tests.iml index 50a9aa76181b..68bf13386721 100644 --- a/plugins/sh/core/intellij.sh.tests.iml +++ b/plugins/sh/core/intellij.sh.tests.iml @@ -14,7 +14,7 @@ - + diff --git a/plugins/sh/BUILD.bazel b/plugins/sh/plugin/BUILD.bazel similarity index 62% rename from plugins/sh/BUILD.bazel rename to plugins/sh/plugin/BUILD.bazel index ed7062028a53..b8fbfebe667a 100644 --- a/plugins/sh/BUILD.bazel +++ b/plugins/sh/plugin/BUILD.bazel @@ -1,28 +1,27 @@ -### auto-generated section `build intellij.sh` start +### auto-generated section `build intellij.sh.plugin` start load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") jvm_resources( - name = "sh_resources", + name = "plugin_resources", files = glob(["resources/**/*"]), strip_prefix = "resources" ) jvm_library( - name = "sh", + name = "plugin", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - runtime_deps = [":sh_resources"] + runtime_deps = [":plugin_resources"] ) -### auto-generated section `build intellij.sh` end +### auto-generated section `build intellij.sh.plugin` end -### auto-generated section `build intellij.sh.main` start +### auto-generated section `build intellij.sh.plugin.main` start jvm_library( - name = "sh-main", + name = "plugin-main", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), runtime_deps = [ - "//platform/bootstrap/coroutine", - "//plugins/sh", + "//plugins/sh/plugin", "//plugins/sh/core", "//plugins/sh/backend", "//plugins/sh/terminal", @@ -33,13 +32,12 @@ jvm_library( ) jvm_library( - name = "sh-main_test_lib", - module_name = "intellij.sh.main", + name = "plugin-main_test_lib", + module_name = "intellij.sh.plugin.main", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), deps = [ - "//platform/bootstrap/coroutine", - "//plugins/sh", + "//plugins/sh/plugin", "//plugins/sh/core", "//plugins/sh/terminal", "//plugins/sh/copyright", @@ -48,4 +46,4 @@ jvm_library( ], runtime_deps = ["//plugins/sh/backend"] ) -### auto-generated section `build intellij.sh.main` end \ No newline at end of file +### auto-generated section `build intellij.sh.plugin.main` end \ No newline at end of file diff --git a/plugins/sh/intellij.sh.iml b/plugins/sh/plugin/intellij.sh.plugin.iml similarity index 100% rename from plugins/sh/intellij.sh.iml rename to plugins/sh/plugin/intellij.sh.plugin.iml diff --git a/plugins/sh/intellij.sh.main.iml b/plugins/sh/plugin/intellij.sh.plugin.main.iml similarity index 83% rename from plugins/sh/intellij.sh.main.iml rename to plugins/sh/plugin/intellij.sh.plugin.main.iml index 4e30f1c60694..5680e05dce2a 100644 --- a/plugins/sh/intellij.sh.main.iml +++ b/plugins/sh/plugin/intellij.sh.plugin.main.iml @@ -4,8 +4,7 @@ - - + diff --git a/plugins/sh/plugin-content.yaml b/plugins/sh/plugin/plugin-content.yaml similarity index 87% rename from plugins/sh/plugin-content.yaml rename to plugins/sh/plugin/plugin-content.yaml index 40af6cb3f5a8..5a669a8f7caa 100644 --- a/plugins/sh/plugin-content.yaml +++ b/plugins/sh/plugin/plugin-content.yaml @@ -4,9 +4,9 @@ - name: lib/modules/intellij.sh.frontend.split.jar contentModules: - name: intellij.sh.frontend.split -- name: lib/sh.jar +- name: lib/sh-plugin.jar modules: - - name: intellij.sh + - name: intellij.sh.plugin contentModules: - name: intellij.sh.core - name: intellij.sh.terminal diff --git a/plugins/sh/resources/META-INF/plugin.xml b/plugins/sh/plugin/resources/META-INF/plugin.xml similarity index 100% rename from plugins/sh/resources/META-INF/plugin.xml rename to plugins/sh/plugin/resources/META-INF/plugin.xml diff --git a/plugins/sh/resources/META-INF/pluginIcon.svg b/plugins/sh/plugin/resources/META-INF/pluginIcon.svg similarity index 100% rename from plugins/sh/resources/META-INF/pluginIcon.svg rename to plugins/sh/plugin/resources/META-INF/pluginIcon.svg diff --git a/plugins/sh/resources/META-INF/pluginIcon_dark.svg b/plugins/sh/plugin/resources/META-INF/pluginIcon_dark.svg similarity index 100% rename from plugins/sh/resources/META-INF/pluginIcon_dark.svg rename to plugins/sh/plugin/resources/META-INF/pluginIcon_dark.svg diff --git a/plugins/terminal/tests/BUILD.bazel b/plugins/terminal/tests/BUILD.bazel index f2233cc4e151..cbba6cea8027 100644 --- a/plugins/terminal/tests/BUILD.bazel +++ b/plugins/terminal/tests/BUILD.bazel @@ -36,7 +36,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/util/coroutines", "//platform/platform-impl/internal", - "//plugins/sh", + "//plugins/sh/plugin", "//platform/code-style-api:codeStyle", "@lib//:assert_j", "@lib//:jediterm-core", diff --git a/plugins/terminal/tests/intellij.terminal.tests.iml b/plugins/terminal/tests/intellij.terminal.tests.iml index 3cf0a68a6f19..ae525ddfdf91 100644 --- a/plugins/terminal/tests/intellij.terminal.tests.iml +++ b/plugins/terminal/tests/intellij.terminal.tests.iml @@ -28,7 +28,7 @@ - + diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt index c7ea39c8229d..ba791f2428b7 100644 --- a/python/build/plugin-list.txt +++ b/python/build/plugin-list.txt @@ -14,7 +14,7 @@ intellij.platform.langInjection.plugin intellij.properties intellij.restructuredtext intellij.searchEverywhereMl -intellij.sh +intellij.sh.plugin intellij.statsCollector intellij.tasks.core intellij.terminal diff --git a/python/intellij.pycharm.community.main.iml b/python/intellij.pycharm.community.main.iml index fb8add5da3b7..5b5faac3c916 100644 --- a/python/intellij.pycharm.community.main.iml +++ b/python/intellij.pycharm.community.main.iml @@ -30,7 +30,7 @@ - +