IJPL-174483 Converted intelliLang to a product module

GitOrigin-RevId: e24900f2a70a4a9d2acb639e2e03a9efddf062bc

.idea/modules.xml

@@ -876,7 +876,6 @@
       <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/backend/intellij.platform.langInjection.backend.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.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/tests/intellij.platform.langInjection.tests.iml" filepath="$PROJECT_DIR$/plugins/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" />

build/bazel-generated-file-list.txt

@@ -706,7 +706,6 @@ platform/xdebugger-testFramework
 plugins/ByteCodeViewer
 plugins/IntelliLang
 plugins/IntelliLang/backend
-plugins/IntelliLang/plugin
 plugins/IntelliLang/tests
 plugins/ant
 plugins/ant/jps-plugin

java/langInjection/jps/resources/intellij.java.langInjection.jps.xml

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

java/plugin/BUILD.bazel

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

java/plugin/intellij.java.plugin.iml

@@ -32,7 +32,6 @@
     <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.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

@@ -38,7 +38,6 @@ 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

@@ -25,7 +25,6 @@
     <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

@@ -47,7 +47,6 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + seq
   "intellij.java.coverage",
   "intellij.java.decompiler",
   "intellij.eclipse",
-  "intellij.platform.langInjection.plugin",
   "intellij.java.debugger.streams",
   "intellij.sh.plugin",
   "intellij.markdown",

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

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

platform/platform-resources/src/META-INF/common-ide-modules.xml

@@ -54,6 +54,9 @@
     <module name="intellij.platform.polySymbols.backend" loading="embedded"/> <!--todo: move to essential modules when not embedded-->
 
     <module name="intellij.regexp" loading="embedded"/>
+
+    <module name="intellij.platform.langInjection"/>
+    <module name="intellij.platform.langInjection.backend"/>
   </content>
 
   <xi:include href="/META-INF/grid-core-modules.xml"/>

plugins/IntelliLang/plugin/BUILD.bazel

@@ -1,20 +0,0 @@
-### 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/backend",
-  ]
-)
-### auto-generated section `build intellij.platform.langInjection.plugin` end

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

@@ -1,13 +0,0 @@
-<?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.platform.langInjection.backend" scope="RUNTIME" />
-  </component>
-</module>

plugins/IntelliLang/plugin/plugin-content.yaml

@@ -1,9 +0,0 @@
-- name: lib/modules/intellij.platform.langInjection.backend.jar
-  contentModules:
-  - name: intellij.platform.langInjection.backend
-- name: lib/modules/intellij.platform.langInjection.jar
-  contentModules:
-  - name: intellij.platform.langInjection
-- name: lib/platform-langInjection-plugin.jar
-  modules:
-  - name: intellij.platform.langInjection.plugin

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

@@ -1,24 +0,0 @@
-<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.platform.langInjection.backend"/>
-  </content>
-</idea-plugin>

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

@@ -1,4 +1,6 @@
 <idea-plugin>
+  <module value="org.intellij.intelliLang"/>
+
   <dependencies>
     <module name="intellij.regexp"/>
   </dependencies>

plugins/IntelliLang/tests/BUILD.bazel

@@ -41,7 +41,6 @@ jvm_library(
     "//java/langInjection/jps",
     "@lib//:asm",
     "//platform/util/jdom",
-    "//plugins/IntelliLang/plugin",
     "//plugins/IntelliLang/backend",
     "//plugins/markdown/plugin:plugin-main",
   ],

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

@@ -27,7 +27,6 @@
     <orderEntry type="module" module-name="intellij.java.langInjection.jps" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.langInjection.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.langInjection.backend" scope="TEST" />
     <orderEntry type="module" module-name="intellij.markdown.plugin.main" scope="TEST" />
   </component>

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

@@ -1,6 +1,5 @@
 <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">

plugins/jsonpath/BUILD.bazel

@@ -56,7 +56,6 @@ 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,7 +27,6 @@
     <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

@@ -183,7 +183,6 @@ jvm_library(
     "//plugins/kotlin/jvm/k1",
     "//plugins/kotlin/base/scripting/scripting.k1",
     "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib",
-    "//plugins/IntelliLang/plugin",
     "//plugins/IntelliLang/backend",
     "//plugins/kotlin/base/scripting/scripting.shared",
   ],

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

@@ -186,7 +186,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" />
     <orderEntry type="module" module-name="intellij.platform.langInjection.backend" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.scripting.shared" scope="TEST" />
   </component>

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

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

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

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

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

@@ -36,7 +36,6 @@
     <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" />
     <orderEntry type="module" module-name="intellij.platform.langInjection.backend" scope="TEST" />
   </component>

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

@@ -1,6 +1,5 @@
 <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,5 @@
 <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,5 @@
 <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>

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

@@ -1,6 +1,5 @@
 <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,5 @@
 <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"/>

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

@@ -1,6 +1,5 @@
 <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

@@ -85,7 +85,6 @@ 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

@@ -36,7 +36,6 @@
     <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.tools.ide.metrics.benchmark" scope="TEST" />

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

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

python/build/plugin-list.txt

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

xml/langInjection/xpath/resources/intellij.xml.langInjection.xpath.xml

@@ -1,7 +1,6 @@
 <idea-plugin>
   <dependencies>
     <plugin id="XPathView"/>
-    <plugin id="org.intellij.intelliLang"/>
     <module name="intellij.xml.langInjection"/>
     <module name="intellij.platform.backend"/>
   </dependencies>

xml/tests/BUILD.bazel

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

xml/tests/intellij.xml.tests.iml

@@ -36,7 +36,6 @@
     <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" />