IJPL-194822 Converted langInjection plugin into v2

GitOrigin-RevId: 8172a3389fa1fb441acef34d19009bcdc5b141fa

.idea/modules.xml

@@ -867,6 +867,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml" filepath="$PROJECT_DIR$/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/lang-impl/intellij.platform.lang.tests.iml" filepath="$PROJECT_DIR$/platform/lang-impl/intellij.platform.lang.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellij.platform.langInjection.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellij.platform.langInjection.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/plugin/intellij.platform.langInjection.plugin.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/plugin/intellij.platform.langInjection.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-tests/intellij.platform.langInjection.tests.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-tests/intellij.platform.langInjection.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/locking.impl/intellij.platform.locking.impl.iml" filepath="$PROJECT_DIR$/platform/locking.impl/intellij.platform.locking.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/lvcs-api/intellij.platform.lvcs.iml" filepath="$PROJECT_DIR$/platform/lvcs-api/intellij.platform.lvcs.iml" />
@@ -1209,6 +1210,7 @@
       <module fileurl="file://$PROJECT_DIR$/xml/xml-frontend-split/intellij.xml.frontend.split.iml" filepath="$PROJECT_DIR$/xml/xml-frontend-split/intellij.xml.frontend.split.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/impl/intellij.xml.impl.iml" filepath="$PROJECT_DIR$/xml/impl/intellij.xml.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/xml-support/xpath/intellij.xml.langInjection.xpath.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/xml-support/xpath/intellij.xml.langInjection.xpath.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-parser/intellij.xml.parser.iml" filepath="$PROJECT_DIR$/xml/xml-parser/intellij.xml.parser.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-api/intellij.xml.psi.iml" filepath="$PROJECT_DIR$/xml/xml-psi-api/intellij.xml.psi.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-impl/intellij.xml.psi.impl.iml" filepath="$PROJECT_DIR$/xml/xml-psi-impl/intellij.xml.psi.impl.iml" />

build/bazel-generated-file-list.txt

@@ -695,7 +695,9 @@ plugins/IntelliLang
 plugins/IntelliLang/IntelliLang-tests
 plugins/IntelliLang/intellilang-jps-plugin
 plugins/IntelliLang/java-support
+plugins/IntelliLang/plugin
 plugins/IntelliLang/xml-support
+plugins/IntelliLang/xml-support/xpath
 plugins/ant
 plugins/ant/jps-plugin
 plugins/built-in-help

docs/plugin-graph/plugin-graph.json

@@ -3808,8 +3808,8 @@
     "name": "intellij.platform.langInjection",
     "n": "i.platform.langInjection",
     "package": null,
-    "sourceModule": "intellij.platform.langInjection",
-    "descriptor": "community/plugins/IntelliLang/src/META-INF/plugin.xml",
+    "sourceModule": "intellij.platform.langInjection.plugin",
+    "descriptor": "community/plugins/IntelliLang/plugin/src/META-INF/plugin.xml",
     "pluginId": "org.intellij.intelliLang",
     "type": 1
   }

java/compiler/tests/com/intellij/compiler/progress/CompilerBuildViewTest.kt

@@ -87,8 +87,8 @@ class CompilerBuildViewTest : BaseCompilerTestCase() {
           Parsing java… [a]
           Writing classes… [a]
           Adding nullability assertions… [a]
-          Adding threading assertions… [a]
           Adding pattern assertions… [a]
+          Adding threading assertions… [a]
           Running 'after' tasks
         """.trimIndent() else """
           Clearing build system data…
@@ -100,8 +100,8 @@ class CompilerBuildViewTest : BaseCompilerTestCase() {
           Parsing java… [a]
           Writing classes… [a]
           Adding nullability assertions… [a]
-          Adding threading assertions… [a]
           Adding pattern assertions… [a]
+          Adding threading assertions… [a]
           Updating dependency information… [a]
           Running 'after' tasks
         """.trimIndent())
@@ -123,8 +123,8 @@ class CompilerBuildViewTest : BaseCompilerTestCase() {
         Parsing java… [a]
         Writing classes… [a]
         Adding nullability assertions… [a]
-        Adding threading assertions… [a]
         Adding pattern assertions… [a]
+        Adding threading assertions… [a]
         Running 'after' tasks
       """.trimIndent() else """
         Executing pre-compile tasks…
@@ -135,8 +135,8 @@ class CompilerBuildViewTest : BaseCompilerTestCase() {
         Parsing java… [a]
         Writing classes… [a]
         Adding nullability assertions… [a]
-        Adding threading assertions… [a]
         Adding pattern assertions… [a]
+        Adding threading assertions… [a]
         Updating dependency information… [a]
         Running 'after' tasks
       """.trimIndent())

java/plugin/BUILD.bazel

@@ -36,7 +36,7 @@ jvm_library(
     "//java/typeMigration",
     "//resources:java-resources",
     "//resources-en:java-resources-en",
-    "//plugins/IntelliLang/java-support:java-langInjection",
+    "//plugins/IntelliLang/plugin",
     "//java/performancePlugin",
     "//java/vcs",
     "//java/java-syntax:syntax",

java/plugin/intellij.java.plugin.iml

@@ -32,7 +32,7 @@
     <orderEntry type="module" module-name="intellij.java.typeMigration" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.resources" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.langInjection" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.ui.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.performancePlugin" scope="RUNTIME" />

json/backend/tests/BUILD.bazel

@@ -36,6 +36,7 @@ jvm_library(
     "//platform/testFramework/extensions:testExtensions",
     "@lib//:kotlin-stdlib",
     "//plugins/IntelliLang:langInjection",
+    "//plugins/IntelliLang/plugin",
     "@lib//:jsonpath",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:assert_j",

json/backend/tests/intellij.json.tests.iml

@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jsonpath" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />

platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt

@@ -45,7 +45,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + seq
   "intellij.java.coverage",
   "intellij.java.decompiler",
   "intellij.eclipse",
-  "intellij.platform.langInjection",
+  "intellij.platform.langInjection.plugin",
   "intellij.java.debugger.streams",
   "intellij.completionMlRanking",
   "intellij.completionMlRankingModels",

platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt

@@ -69,9 +69,7 @@ object CommunityRepositoryModules {
     pluginAuto(listOf("intellij.xpath")) { spec ->
       spec.withModule("intellij.xpath.rt", "rt/xslt-rt.jar")
     },
-    pluginAuto(listOf("intellij.platform.langInjection", "intellij.java.langInjection", "intellij.xml.langInjection")) { spec ->
-      spec.withModule("intellij.java.langInjection.jps")
-    },
+    pluginAuto("intellij.platform.langInjection.plugin") {},
     pluginAutoWithCustomDirName("intellij.tasks.core") { spec ->
       spec.directoryName = "tasks"
       spec.withModule("intellij.tasks")

platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml

@@ -22,7 +22,7 @@
     <name>XPathView + XSLT</name>
     <depends>com.intellij.modules.xml</depends>
   </idea-plugin>
-  <idea-plugin url="file://out/intellij.platform.langInjection/META-INF/plugin.xml">
+  <idea-plugin url="file://out/intellij.platform.langInjection.plugin/META-INF/plugin.xml">
     <id>-org-intellij-intelliLang-</id>
     <name>IntelliLang</name>
     <depends optional="true">-XPathView-</depends>

plugins/IntelliLang/intellilang-jps-plugin/resources/intellij.java.langInjection.jps.xml

@@ -0,0 +1,8 @@
+<idea-plugin>
+  <dependencies>
+    <plugin id="com.intellij.java"/>
+  </dependencies>
+  <extensions defaultExtensionNs="com.intellij">
+    <jps.plugin/>
+  </extensions>
+</idea-plugin>

plugins/IntelliLang/java-support/resources/intellij.java.langInjection.xml

@@ -1,4 +1,8 @@
 <idea-plugin>
+  <dependencies>
+    <plugin id="com.intellij.java"/>
+    <module name="intellij.platform.langInjection"/>
+  </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <localInspection language="JAVA" shortName="UnknownLanguage" groupKey="inspections.language.injection.group.name" enabledByDefault="true"
                      level="ERROR" implementationClass="org.intellij.plugins.intelliLang.inject.java.validation.UnknownLanguageID"

plugins/IntelliLang/plugin-content.yaml

@@ -1,8 +0,0 @@
-- name: lib/java-langInjection-jps.jar
-  modules:
-  - name: intellij.java.langInjection.jps
-- name: lib/platform-langInjection.jar
-  modules:
-  - name: intellij.platform.langInjection
-  - name: intellij.java.langInjection
-  - name: intellij.xml.langInjection

plugins/IntelliLang/plugin/BUILD.bazel

@@ -0,0 +1,22 @@
+### auto-generated section `build intellij.platform.langInjection.plugin` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "plugin_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "plugin",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  runtime_deps = [
+    ":plugin_resources",
+    "//plugins/IntelliLang:langInjection",
+    "//plugins/IntelliLang/java-support:java-langInjection",
+    "//plugins/IntelliLang/xml-support:xml-langInjection",
+    "//plugins/IntelliLang/intellilang-jps-plugin:java-langInjection-jps",
+  ]
+)
+### auto-generated section `build intellij.platform.langInjection.plugin` end

plugins/IntelliLang/plugin/intellij.platform.langInjection.plugin.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.langInjection" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.langInjection.jps" scope="RUNTIME" />
+  </component>
+</module>

plugins/IntelliLang/plugin/plugin-content.yaml

@@ -0,0 +1,18 @@
+- name: lib/modules/intellij.java.langInjection.jar
+  contentModules:
+  - name: intellij.java.langInjection
+- name: lib/modules/intellij.java.langInjection.jps.jar
+  contentModules:
+  - name: intellij.java.langInjection.jps
+- name: lib/modules/intellij.platform.langInjection.jar
+  contentModules:
+  - name: intellij.platform.langInjection
+- name: lib/modules/intellij.xml.langInjection.jar
+  contentModules:
+  - name: intellij.xml.langInjection
+- name: lib/modules/intellij.xml.langInjection.xpath.jar
+  contentModules:
+  - name: intellij.xml.langInjection.xpath
+- name: lib/platform-langInjection-plugin.jar
+  modules:
+  - name: intellij.platform.langInjection.plugin

plugins/IntelliLang/plugin/resources/META-INF/plugin.xml

@@ -0,0 +1,27 @@
+<idea-plugin>
+  <name>IntelliLang</name>
+  <id>org.intellij.intelliLang</id>
+  <category>IDE Settings</category>
+  <vendor>JetBrains</vendor>
+  <description>
+    <![CDATA[
+      Enables user-configurable language injection support (originally developed by Sascha Weinreuter sascha.weinreuter@cit.de)
+        The following features are available:
+        <ul>
+        <li>Language injection</li>
+        <li>Pattern validation</li>
+        <li>Regular expression support</li>
+        <li>Language Injections page in the Settings/Preferences dialog.</li>
+        <li>Ability to edit injected code in the special scratch-pad editor.</l>
+        </ul>
+      ]]>
+  </description>
+
+  <content>
+    <module name="intellij.platform.langInjection" loading="required"/>
+    <module name="intellij.xml.langInjection"/>
+    <module name="intellij.xml.langInjection.xpath"/>
+    <module name="intellij.java.langInjection"/>
+    <module name="intellij.java.langInjection.jps"/>
+  </content>
+</idea-plugin>

plugins/IntelliLang/resources/intellij.platform.langInjection.xml

@@ -1,29 +1,9 @@
 <idea-plugin>
-  <name>IntelliLang</name>
-  <id>org.intellij.intelliLang</id>
-  <category>IDE Settings</category>
-  <vendor>JetBrains</vendor>
-  <description>
-      <![CDATA[
-      Enables user configurable language injection support (originally developed by Sascha Weinreuter sascha.weinreuter@cit.de)
-        The following features are available:
-        <ul>
-        <li>Language injection</li>
-        <li>Pattern validation</li>
-        <li>Regular expression support</li>
-        <li>Language Injections page in the Settings/Preferences dialog.</li>
-        <li>Ability to edit injected code in the special scratch-pad editor.</l>
-        </ul>
-      ]]>
-   </description>
-
-  <depends optional="true" config-file="intellilang-xpath-support.xml">XPathView</depends>
-  <depends optional="true" config-file="intellilang-java-support.xml">com.intellij.java</depends>
-  <depends optional="true" config-file="intellilang-xml-support.xml">com.intellij.modules.xml</depends>
-
   <extensionPoints>
-    <extensionPoint name="languageSupport" interface="org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport" dynamic="true"/>
-    <extensionPoint name="injectionConfig" beanClass="org.intellij.plugins.intelliLang.LanguageInjectionConfigBean" dynamic="true"/>
+    <extensionPoint qualifiedName="org.intellij.intelliLang.languageSupport"
+                    interface="org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport" dynamic="true"/>
+    <extensionPoint qualifiedName="org.intellij.intelliLang.injectionConfig"
+                    beanClass="org.intellij.plugins.intelliLang.LanguageInjectionConfigBean" dynamic="true"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">

plugins/IntelliLang/xml-support/resources/intellij.xml.langInjection.xml

@@ -1,4 +1,9 @@
 <idea-plugin>
+  <dependencies>
+    <plugin id="com.intellij.modules.xml"/>
+    <module name="intellij.platform.langInjection"/>
+  </dependencies>
+
 
   <extensions defaultExtensionNs="com.intellij">
     <multiHostInjector implementation="org.intellij.plugins.intelliLang.inject.xml.XmlLanguageInjector"/>

plugins/IntelliLang/xml-support/xpath/BUILD.bazel

@@ -0,0 +1,29 @@
+### auto-generated section `build intellij.xml.langInjection.xpath` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "xpath_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "xpath",
+  module_name = "intellij.xml.langInjection.xpath",
+  visibility = ["//visibility:public"],
+  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
+  deps = [
+    "//plugins/IntelliLang/xml-support:xml-langInjection",
+    "//plugins/xpath",
+    "//xml/xml-psi-impl:psi-impl",
+    "//xml/xml-parser:parser",
+    "@lib//:jetbrains-annotations",
+    "//xml/xml-psi-api:psi",
+    "@lib//:jaxen",
+    "//platform/core-api:core",
+    "//platform/core-impl",
+    "//platform/util",
+  ],
+  runtime_deps = [":xpath_resources"]
+)
+### auto-generated section `build intellij.xml.langInjection.xpath` end

plugins/IntelliLang/xml-support/xpath/intellij.xml.langInjection.xpath.iml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.xml.langInjection" />
+    <orderEntry type="module" module-name="intellij.xpath" />
+    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
+    <orderEntry type="library" name="Jaxen" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+  </component>
+</module>

plugins/IntelliLang/xml-support/xpath/resources/intellij.xml.langInjection.xpath.xml

@@ -1,4 +1,8 @@
 <idea-plugin>
+  <dependencies>
+    <plugin id="XPathView"/>
+    <module name="intellij.xml.langInjection"/>
+  </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="org.intellij.plugins.intelliLang.inject.config.XPathSupportProxy"
                         serviceImplementation="org.intellij.plugins.intelliLang.inject.config.XPathSupportProxyImpl"/>

plugins/devkit/intellij.devkit.intelliLang/resources/intellij.devkit.intelliLang.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="org.jetbrains.idea.devkit.intelliLang">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.langInjection"/>
   </dependencies>
   <extensions defaultExtensionNs="org.intellij.intelliLang">
     <injectionConfig config="devkit-xmlInjections.xml"/>

plugins/jsonpath/BUILD.bazel

@@ -57,6 +57,7 @@ jvm_library(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//plugins/IntelliLang:langInjection",
+    "//plugins/IntelliLang/plugin",
     "//platform/testFramework/extensions:testExtensions",
   ],
   runtime_deps = [":jsonpath_resources"]

plugins/jsonpath/intellij.jsonpath.iml

@@ -27,6 +27,7 @@
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>
 </module>

plugins/kotlin/idea/tests/BUILD.bazel

@@ -184,6 +184,7 @@ jvm_library(
     "//plugins/kotlin/jvm/k1",
     "//plugins/kotlin/base/scripting.k1",
     "//plugins/kotlin/base/scripting.k1:scripting.k1_test_lib",
+    "//plugins/IntelliLang/plugin",
   ],
   runtime_deps = [
     "//plugins/kotlin/gradle/gradle",

plugins/kotlin/idea/tests/kotlin.idea.tests.iml

@@ -187,5 +187,6 @@
     <orderEntry type="module" module-name="kotlin.code-insight.live-templates.shared" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.jvm.k1" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.scripting.k1" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="TEST" />
   </component>
 </module>

plugins/kotlin/injection/base/resources/kotlin.base.injection.xml

@@ -1,5 +1,6 @@
 <idea-plugin package="org.jetbrains.kotlin.idea.base.injection">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.java.langInjection"/>
   </dependencies>
 </idea-plugin>

plugins/kotlin/injection/base/tests/BUILD.bazel

@@ -35,6 +35,7 @@ jvm_library(
     "//RegExpSupport:regexp",
     "//RegExpSupport:regexp_test_lib",
     "//plugins/IntelliLang:langInjection",
+    "//plugins/IntelliLang/plugin",
     "@lib//:kotlinc-kotlin-compiler-common",
   ]
 )

plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml

@@ -36,6 +36,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
   </component>
 </module>

plugins/kotlin/injection/k1/resources/kotlin.injection.k1.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="org.jetbrains.kotlin.idea.injection">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.langInjection"/>
     <module name="kotlin.base.injection"/>
   </dependencies>
 

plugins/kotlin/injection/k2/resources/kotlin.injection.k2.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="org.jetbrains.kotlin.idea.k2.injection">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.langInjection"/>
     <module name="kotlin.base.injection"/>
   </dependencies>
 

plugins/markdown/fenceInjection/src/main/resources/intellij.markdown.fenceInjection.xml

@@ -1,6 +1,8 @@
 <idea-plugin package="org.intellij.plugins.markdown.fenceInjection">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.backend"/>
+    <module name="intellij.platform.langInjection"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">

plugins/markdown/frontmatter/src/main/resources/intellij.markdown.frontmatter.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="org.intellij.plugins.markdown.frontmatter">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.langInjection"/>
     <module name="intellij.json.backend"/>
   </dependencies>
 

plugins/markdown/frontmatter/toml/src/main/resources/intellij.markdown.frontmatter.toml.xml

@@ -1,6 +1,8 @@
 <idea-plugin package="org.intellij.plugins.markdown.frontmatter.toml">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.langInjection"/>
+    <module name="intellij.platform.backend"/>
     <plugin id="org.toml.lang"/>
   </dependencies>
 

plugins/markdown/frontmatter/yaml/src/main/resources/intellij.markdown.frontmatter.yaml.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="org.intellij.plugins.markdown.frontmatter.yaml">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.langInjection"/>
     <module name="intellij.yaml.backend"/>
   </dependencies>
 

plugins/yaml/backend/BUILD.bazel

@@ -88,6 +88,7 @@ jvm_library(
     "//platform/core-ui",
     "//platform/code-style-impl:codeStyle-impl",
     "//plugins/IntelliLang:langInjection",
+    "//plugins/IntelliLang/plugin",
     "//platform/statistics",
     "//platform/statistics:statistics_test_lib",
     "//RegExpSupport:regexp",

plugins/yaml/backend/intellij.yaml.backend.iml

@@ -37,6 +37,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
     <orderEntry type="module" module-name="intellij.sh" scope="TEST" />

python/IntelliLang-python/resources/intellij.python.langInjection.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.langInjection">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.platform.langInjection"/>
   </dependencies>
   <extensions defaultExtensionNs="org.intellij.intelliLang">
     <languageSupport implementation="com.intellij.python.langInjection.PyLanguageInjectionSupport"/>

python/build/plugin-list.txt

@@ -10,7 +10,7 @@ intellij.editorconfig.plugin
 intellij.featuresTrainer
 intellij.grazie
 intellij.markdown
-intellij.platform.langInjection
+intellij.platform.langInjection.plugin
 intellij.properties
 intellij.restructuredtext
 intellij.searchEverywhereMl

xml/tests/BUILD.bazel

@@ -51,6 +51,7 @@ jvm_library(
     "//RegExpSupport:regexp_test_lib",
     "//platform/util/nanoxml",
     "//plugins/IntelliLang:langInjection",
+    "//plugins/IntelliLang/plugin",
     "//plugins/IntelliLang/java-support:java-langInjection",
     "//xml/xml-analysis-impl:analysis-impl",
     "//platform/core-ui",

xml/tests/intellij.xml.tests.iml

@@ -36,6 +36,7 @@
     <orderEntry type="module" module-name="intellij.regexp" />
     <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.langInjection" />
     <orderEntry type="module" module-name="intellij.xml.analysis.impl" scope="TEST" />