From fc1b79832c2bf77b8a9a006c90e552727b810e87 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Sat, 7 Feb 2026 11:44:56 +0100 Subject: [PATCH] [kotlin] rename kotlin.bundled-compiler-plugins-support to intellij.kotlin.compilerPlugins.support.bundled KTIJ-10041 GitOrigin-RevId: 9d6e6ab64be75fe606f92a23da90ca93370ab2f6 --- .idea/modules.xml | 2 +- .../intellij/build/kotlin/KotlinPluginBuilder.kt | 2 +- plugins/kotlin/BUILD.bazel | 6 +++--- plugins/kotlin/all-tests-fir/BUILD.bazel | 2 +- .../kotlin/all-tests-fir/kotlin.fir-all-tests.iml | 2 +- .../bundled-compiler-plugins-support/BUILD.bazel | 13 ++++++------- ...llij.kotlin.compilerPlugins.support.bundled.iml} | 1 - .../code-insight/kotlin.code-insight.k2/BUILD.bazel | 2 +- .../intellij.kotlin.codeInsight.iml | 2 +- plugins/kotlin/fir/BUILD.bazel | 2 +- plugins/kotlin/fir/kotlin.fir.iml | 2 +- plugins/kotlin/idea/tests/BUILD.bazel | 2 +- plugins/kotlin/idea/tests/kotlin.idea.tests.iml | 2 +- .../intellij.kotlin.plugin.community.main.iml | 2 +- plugins/kotlin/plugin/k2/BUILD.bazel | 2 +- plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml | 2 +- plugins/kotlin/plugin/plugin-content.yaml | 2 +- 17 files changed, 23 insertions(+), 25 deletions(-) rename plugins/kotlin/bundled-compiler-plugins-support/{kotlin.bundled-compiler-plugins-support.iml => intellij.kotlin.compilerPlugins.support.bundled.iml} (96%) diff --git a/.idea/modules.xml b/.idea/modules.xml index bd251980786d..721e7c91b339 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -723,6 +723,7 @@ + @@ -1649,7 +1650,6 @@ - diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt index b67892e71407..925b49d35e72 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt @@ -211,7 +211,7 @@ abstract class KotlinPluginBuilder(val kind : KotlinPluginKind = System.getPrope "intellij.kotlin.refactorings.move", "intellij.kotlin.refactorings.rename", "intellij.kotlin.performanceExtendedPlugin", - "kotlin.bundled-compiler-plugins-support", + "intellij.kotlin.compilerPlugins.support.bundled", "kotlin.jsr223", "intellij.kotlin.internal", "intellij.kotlin.base.serialization" diff --git a/plugins/kotlin/BUILD.bazel b/plugins/kotlin/BUILD.bazel index c39b5753e354..211304d32393 100644 --- a/plugins/kotlin/BUILD.bazel +++ b/plugins/kotlin/BUILD.bazel @@ -201,7 +201,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/kotlin.performanceExtendedPlugin", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//plugins/kotlin/onboarding", "//plugins/kotlin/base/code-insight/minimal", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal", @@ -423,7 +423,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/kotlin.performanceExtendedPlugin", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//plugins/kotlin/onboarding", "//plugins/kotlin/onboarding-gradle", "//plugins/kotlin/onboarding-maven", @@ -664,7 +664,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/kotlin.performanceExtendedPlugin", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//plugins/kotlin/onboarding", "//plugins/kotlin/onboarding:onboarding_test_lib", "//plugins/kotlin/base/code-insight/minimal", diff --git a/plugins/kotlin/all-tests-fir/BUILD.bazel b/plugins/kotlin/all-tests-fir/BUILD.bazel index 9b2720f100f4..2d64a798a80f 100644 --- a/plugins/kotlin/all-tests-fir/BUILD.bazel +++ b/plugins/kotlin/all-tests-fir/BUILD.bazel @@ -41,7 +41,7 @@ jvm_library( "//plugins/kotlin/kotlin.searching/kotlin.searching.test.k2:test", "//plugins/kotlin/base/util", "//plugins/kotlin/compiler-reference-index/tests.k2:kotlin-compilerReferenceIndex-tests", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//plugins/kotlin/uast/uast-kotlin-fir/tests", "//plugins/kotlin/compiler-plugins/parcelize/tests", "//plugins/kotlin/compiler-plugins/parcelize/tests/k2:kotlin-compilerPlugins-parcelize-tests", diff --git a/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml b/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml index 687a94e8f8db..35500a639565 100644 --- a/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml +++ b/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml @@ -41,7 +41,7 @@ - + diff --git a/plugins/kotlin/bundled-compiler-plugins-support/BUILD.bazel b/plugins/kotlin/bundled-compiler-plugins-support/BUILD.bazel index db9a24113998..f0a2e97f10e3 100644 --- a/plugins/kotlin/bundled-compiler-plugins-support/BUILD.bazel +++ b/plugins/kotlin/bundled-compiler-plugins-support/BUILD.bazel @@ -1,9 +1,9 @@ -### auto-generated section `build kotlin.bundled-compiler-plugins-support` start +### auto-generated section `build intellij.kotlin.compilerPlugins.support.bundled` start load("//build:compiler-options.bzl", "create_kotlinc_options") load("@rules_jvm//:jvm.bzl", "jvm_library") create_kotlinc_options( - name = "custom_bundled-compiler-plugins-support", + name = "custom_compilerPlugins-support-bundled", opt_in = [ "com.intellij.openapi.util.IntellijInternalApi", "org.jetbrains.kotlin.K1Deprecation", @@ -11,14 +11,13 @@ create_kotlinc_options( ) jvm_library( - name = "bundled-compiler-plugins-support", - module_name = "kotlin.bundled-compiler-plugins-support", + name = "compilerPlugins-support-bundled", + module_name = "intellij.kotlin.compilerPlugins.support.bundled", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), - kotlinc_opts = ":custom_bundled-compiler-plugins-support", + kotlinc_opts = ":custom_compilerPlugins-support-bundled", deps = [ "@lib//:kotlin-stdlib", - "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlinc-kotlin-compiler-common", "//platform/core-api:core", "//platform/lang-api:lang", @@ -36,4 +35,4 @@ jvm_library( "@lib//:kotlinc-kotlin-dataframe-compiler-plugin", ] ) -### auto-generated section `build kotlin.bundled-compiler-plugins-support` end \ No newline at end of file +### auto-generated section `build intellij.kotlin.compilerPlugins.support.bundled` end \ No newline at end of file diff --git a/plugins/kotlin/bundled-compiler-plugins-support/kotlin.bundled-compiler-plugins-support.iml b/plugins/kotlin/bundled-compiler-plugins-support/intellij.kotlin.compilerPlugins.support.bundled.iml similarity index 96% rename from plugins/kotlin/bundled-compiler-plugins-support/kotlin.bundled-compiler-plugins-support.iml rename to plugins/kotlin/bundled-compiler-plugins-support/intellij.kotlin.compilerPlugins.support.bundled.iml index 36f12522ed8f..022b135e52cc 100644 --- a/plugins/kotlin/bundled-compiler-plugins-support/kotlin.bundled-compiler-plugins-support.iml +++ b/plugins/kotlin/bundled-compiler-plugins-support/intellij.kotlin.compilerPlugins.support.bundled.iml @@ -24,7 +24,6 @@ - diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel index 3a5209e4ab69..10edf70e06fa 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel @@ -174,7 +174,7 @@ jvm_library( "//java/testFramework", "//plugins/kotlin/base/statistics", "//platform/editor-ui-ex:editor-ex", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//plugins/kotlin/base/scripting/scripting.k2:kotlin-base-scripting", "//plugins/kotlin/base/scripting/scripting.k2:kotlin-base-scripting_test_lib", "//plugins/kotlin/intellij.kotlin.base.test:base-test_test_lib", diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml index 56f4f191c56a..0f25d1c0bd0c 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml @@ -91,7 +91,7 @@ - + diff --git a/plugins/kotlin/fir/BUILD.bazel b/plugins/kotlin/fir/BUILD.bazel index 16cd7b706ce2..226c8d424e58 100644 --- a/plugins/kotlin/fir/BUILD.bazel +++ b/plugins/kotlin/fir/BUILD.bazel @@ -74,7 +74,7 @@ jvm_library( "//plugins/kotlin/base/compiler-configuration", "//plugins/kotlin/code-insight/override-implement-shared:kotlin-code-insight-override-implement-shared", "//plugins/kotlin/code-insight/override-implement-k2:kotlin-codeInsight-overrideImplement", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//platform/workspace/jps", "//platform/backend/workspace", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", diff --git a/plugins/kotlin/fir/kotlin.fir.iml b/plugins/kotlin/fir/kotlin.fir.iml index 287be6ec1f9d..6e7a07241033 100644 --- a/plugins/kotlin/fir/kotlin.fir.iml +++ b/plugins/kotlin/fir/kotlin.fir.iml @@ -81,7 +81,7 @@ - + diff --git a/plugins/kotlin/idea/tests/BUILD.bazel b/plugins/kotlin/idea/tests/BUILD.bazel index 78d430574418..778d5fb52536 100644 --- a/plugins/kotlin/idea/tests/BUILD.bazel +++ b/plugins/kotlin/idea/tests/BUILD.bazel @@ -232,7 +232,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/projectModel-api:projectModel", "//plugins/kotlin/kotlin.ide", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//platform/navbar/testFramework", "//platform/execution.dashboard", "//plugins/kotlin/code-insight/intentions-shared:kotlin-code-insight-intentions-shared", diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml index add83cfd9741..f5caee05e73f 100644 --- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml +++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml @@ -176,7 +176,7 @@ - + diff --git a/plugins/kotlin/intellij.kotlin.plugin.community.main.iml b/plugins/kotlin/intellij.kotlin.plugin.community.main.iml index 64baf83b58ed..67cf69bde5aa 100644 --- a/plugins/kotlin/intellij.kotlin.plugin.community.main.iml +++ b/plugins/kotlin/intellij.kotlin.plugin.community.main.iml @@ -211,7 +211,7 @@ - + diff --git a/plugins/kotlin/plugin/k2/BUILD.bazel b/plugins/kotlin/plugin/k2/BUILD.bazel index 2676c9285d24..406126db0b00 100644 --- a/plugins/kotlin/plugin/k2/BUILD.bazel +++ b/plugins/kotlin/plugin/k2/BUILD.bazel @@ -118,7 +118,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/kotlin.searching", - "//plugins/kotlin/bundled-compiler-plugins-support", + "//plugins/kotlin/bundled-compiler-plugins-support:compilerPlugins-support-bundled", "//plugins/kotlin/compiler-plugins/compiler-plugin-support/common:kotlin-compilerPlugins-support", "//plugins/kotlin/compiler-plugins/assignment/common:kotlin-compilerPlugins-assignment-fixes", "//plugins/kotlin/compiler-plugins/assignment/maven", diff --git a/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml b/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml index bd6f3d024580..353189844989 100644 --- a/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml +++ b/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml @@ -108,7 +108,7 @@ - + diff --git a/plugins/kotlin/plugin/plugin-content.yaml b/plugins/kotlin/plugin/plugin-content.yaml index ad51ba654efa..ac330bc898b3 100644 --- a/plugins/kotlin/plugin/plugin-content.yaml +++ b/plugins/kotlin/plugin/plugin-content.yaml @@ -280,7 +280,7 @@ - name: intellij.kotlin.refactorings.move - name: intellij.kotlin.refactorings.rename - name: intellij.kotlin.performanceExtendedPlugin - - name: kotlin.bundled-compiler-plugins-support + - name: intellij.kotlin.compilerPlugins.support.bundled - name: kotlin.jsr223 - name: intellij.kotlin.internal - name: intellij.kotlin.base.serialization