From 6b4c82ceed624f423775c19a3918f57c9149a599 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Wed, 29 Jan 2025 16:29:25 +0100 Subject: [PATCH] [kotlin] cleanup: get rid of fake packages in content modules of Kotlin Frontend plugin (KTIJ-32906) Fake packages were used to ensure that the main plugin classloader is used to load the classes from content modules. Now the same can be achieved explicitly with loading="embedded" attribute. This is also needed to ensure that the classpath for content modules can be properly specified (this is needed for IJPL-165692). GitOrigin-RevId: 94965f7cde9083e4b4f8eb460f0da94f004b7cc9 --- .../minimal/resource/kotlin.base.code-insight.minimal.xml | 2 +- .../src/org/jetbrains/kotlin/idea/codeInsight/fake/empty.txt | 0 .../kotlin/base/resources/resources/kotlin.base.resources.xml | 2 +- .../src/org/jetbrains/kotlin/idea/resources/fake/empty.txt | 0 .../formatter/minimal/resources/kotlin.formatter.minimal.xml | 2 +- .../resource/kotlin.highlighting.minimal.xml | 2 +- .../src/org/jetbrains/kotlin/idea/highlighter/fake/empty.txt | 0 7 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/codeInsight/fake/empty.txt delete mode 100644 plugins/kotlin/base/resources/src/org/jetbrains/kotlin/idea/resources/fake/empty.txt delete mode 100644 plugins/kotlin/highlighting/highlighting-minimal/src/org/jetbrains/kotlin/idea/highlighter/fake/empty.txt diff --git a/plugins/kotlin/base/code-insight/minimal/resource/kotlin.base.code-insight.minimal.xml b/plugins/kotlin/base/code-insight/minimal/resource/kotlin.base.code-insight.minimal.xml index d5e53c76dd2c..fd40d3a1a28d 100644 --- a/plugins/kotlin/base/code-insight/minimal/resource/kotlin.base.code-insight.minimal.xml +++ b/plugins/kotlin/base/code-insight/minimal/resource/kotlin.base.code-insight.minimal.xml @@ -1,4 +1,4 @@ - + diff --git a/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/codeInsight/fake/empty.txt b/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/codeInsight/fake/empty.txt deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/plugins/kotlin/base/resources/resources/kotlin.base.resources.xml b/plugins/kotlin/base/resources/resources/kotlin.base.resources.xml index 80d7f85edb6b..1f2fda4fcb20 100644 --- a/plugins/kotlin/base/resources/resources/kotlin.base.resources.xml +++ b/plugins/kotlin/base/resources/resources/kotlin.base.resources.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/plugins/kotlin/base/resources/src/org/jetbrains/kotlin/idea/resources/fake/empty.txt b/plugins/kotlin/base/resources/src/org/jetbrains/kotlin/idea/resources/fake/empty.txt deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/plugins/kotlin/formatter/minimal/resources/kotlin.formatter.minimal.xml b/plugins/kotlin/formatter/minimal/resources/kotlin.formatter.minimal.xml index 42958c6574a7..5fad8f4e1faf 100644 --- a/plugins/kotlin/formatter/minimal/resources/kotlin.formatter.minimal.xml +++ b/plugins/kotlin/formatter/minimal/resources/kotlin.formatter.minimal.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/plugins/kotlin/highlighting/highlighting-minimal/resource/kotlin.highlighting.minimal.xml b/plugins/kotlin/highlighting/highlighting-minimal/resource/kotlin.highlighting.minimal.xml index c643b100f299..13d3338daae2 100644 --- a/plugins/kotlin/highlighting/highlighting-minimal/resource/kotlin.highlighting.minimal.xml +++ b/plugins/kotlin/highlighting/highlighting-minimal/resource/kotlin.highlighting.minimal.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/plugins/kotlin/highlighting/highlighting-minimal/src/org/jetbrains/kotlin/idea/highlighter/fake/empty.txt b/plugins/kotlin/highlighting/highlighting-minimal/src/org/jetbrains/kotlin/idea/highlighter/fake/empty.txt deleted file mode 100644 index e69de29bb2d1..000000000000