From 4be493e18c8f273f165e95d2292ea419251a4336 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Thu, 6 Mar 2025 15:45:35 +0100
Subject: [PATCH] IDEA-359853 introduce intellij.java.syntax module

GitOrigin-RevId: a0fdf52125e1fef08203de16198825e58d1df490
---
 .idea/modules.xml                             |  1 +
 java/idea-ui/intellij.java.ui.iml             |  1 +
 .../intellij.java.frontback.impl.iml          |  1 +
 .../intellij.java.frontback.psi.iml           |  2 ++
 .../intellij.java.frontback.psi.impl.iml      |  1 +
 .../intellij.java.frontback.tests.iml         |  2 ++
 .../intellij.java.impl.inspections.iml        |  1 +
 java/java-impl/intellij.java.impl.iml         |  1 +
 .../intellij.java.indexing.impl.iml           |  1 +
 java/java-psi-api/intellij.java.psi.iml       |  1 +
 java/java-psi-impl/intellij.java.psi.impl.iml |  2 ++
 java/java-syntax/intellij.java.syntax.iml     | 36 +++++++++++++++++++
 .../resources/intellij.java.syntax.xml        |  2 ++
 java/java-tests/intellij.java.tests.iml       |  2 ++
 java/plugin/intellij.java.plugin.iml          |  1 +
 java/plugin/plugin-content.yaml               |  1 +
 java/plugin/resources/META-INF/plugin.xml     |  1 +
 .../intellij.java.testFramework.iml           |  1 +
 .../intellij.java.testFramework.shared.iml    |  1 +
 19 files changed, 59 insertions(+)
 create mode 100644 java/java-syntax/intellij.java.syntax.iml
 create mode 100644 java/java-syntax/resources/intellij.java.syntax.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 75965391d538..430799357aeb 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -520,6 +520,7 @@
       <module fileurl="file://$PROJECT_DIR$/java/java-runtime/intellij.java.rt.iml" filepath="$PROJECT_DIR$/java/java-runtime/intellij.java.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/structuralsearch-java/intellij.java.structuralSearch.iml" filepath="$PROJECT_DIR$/java/structuralsearch-java/intellij.java.structuralSearch.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/java-structure-view/intellij.java.structureView.iml" filepath="$PROJECT_DIR$/java/java-structure-view/intellij.java.structureView.iml" />
+      <module fileurl="file://$PROJECT_DIR$/java/java-syntax/intellij.java.syntax.iml" filepath="$PROJECT_DIR$/java/java-syntax/intellij.java.syntax.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.iml" filepath="$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.tests.iml" filepath="$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/testFramework/intellij.java.testFramework.iml" filepath="$PROJECT_DIR$/java/testFramework/intellij.java.testFramework.iml" />
diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml
index 5198bff93dc9..53fb56f0fa03 100644
--- a/java/idea-ui/intellij.java.ui.iml
+++ b/java/idea-ui/intellij.java.ui.iml
@@ -41,5 +41,6 @@
     <orderEntry type="module" module-name="intellij.platform.backend.observation" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-frontback-impl/intellij.java.frontback.impl.iml b/java/java-frontback-impl/intellij.java.frontback.impl.iml
index 1880adf96e9c..abdc3e8f6394 100644
--- a/java/java-frontback-impl/intellij.java.frontback.impl.iml
+++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml
@@ -19,5 +19,6 @@
     <orderEntry type="module" module-name="intellij.xml.parser" exported="" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.psi" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-frontback-psi-api/intellij.java.frontback.psi.iml b/java/java-frontback-psi-api/intellij.java.frontback.psi.iml
index 3cb7ef4b4141..e6ec51fd89ad 100644
--- a/java/java-frontback-psi-api/intellij.java.frontback.psi.iml
+++ b/java/java-frontback-psi-api/intellij.java.frontback.psi.iml
@@ -26,5 +26,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.core" exported="" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.java.syntax" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml
index 273bc40b838b..2d218d09c7a2 100644
--- a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml
+++ b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml
@@ -39,5 +39,6 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.psi" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-frontback-tests/intellij.java.frontback.tests.iml b/java/java-frontback-tests/intellij.java.frontback.tests.iml
index 81b909ac5e0f..c872d6fa06da 100644
--- a/java/java-frontback-tests/intellij.java.frontback.tests.iml
+++ b/java/java-frontback-tests/intellij.java.frontback.tests.iml
@@ -20,5 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.tests" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework.shared" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.psi" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.syntax" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-impl-inspections/intellij.java.impl.inspections.iml b/java/java-impl-inspections/intellij.java.impl.inspections.iml
index 35397cae168f..010ecafc4d3c 100644
--- a/java/java-impl-inspections/intellij.java.impl.inspections.iml
+++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml
@@ -24,5 +24,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
     <orderEntry type="module" module-name="intellij.java.codeserver.highlighting" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index a39e445871b5..d4cbdfad06db 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -89,6 +89,7 @@
     <orderEntry type="module" module-name="intellij.platform.todo" />
     <orderEntry type="module" module-name="intellij.java.codeserver.highlighting" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/java-indexing-impl/intellij.java.indexing.impl.iml b/java/java-indexing-impl/intellij.java.indexing.impl.iml
index 76222290dc43..ac8a1d661a45 100644
--- a/java/java-indexing-impl/intellij.java.indexing.impl.iml
+++ b/java/java-indexing-impl/intellij.java.indexing.impl.iml
@@ -19,5 +19,6 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-psi-api/intellij.java.psi.iml b/java/java-psi-api/intellij.java.psi.iml
index e8c67b2727a8..eae91fb228d2 100644
--- a/java/java-psi-api/intellij.java.psi.iml
+++ b/java/java-psi-api/intellij.java.psi.iml
@@ -27,5 +27,6 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-psi-impl/intellij.java.psi.impl.iml b/java/java-psi-impl/intellij.java.psi.impl.iml
index 17fc1a635244..5b545e981e77 100644
--- a/java/java-psi-impl/intellij.java.psi.impl.iml
+++ b/java/java-psi-impl/intellij.java.psi.impl.iml
@@ -31,5 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.psi" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-syntax/intellij.java.syntax.iml b/java/java-syntax/intellij.java.syntax.iml
new file mode 100644
index 000000000000..0b9264a78950
--- /dev/null
+++ b/java/java-syntax/intellij.java.syntax.iml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="5" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xno-param-assertions -Xno-call-assertions" />
+        </compilerSettings>
+        <compilerArguments>
+          <stringArguments>
+            <stringArg name="jvmTarget" arg="1.8" />
+            <stringArg name="apiVersion" arg="2.0" />
+            <stringArg name="languageVersion" arg="2.0" />
+          </stringArguments>
+        </compilerArguments>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <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.platform.syntax" exported="" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.i18n" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.base.multiplatform" />
+    <orderEntry type="module" module-name="intellij.platform.util.multiplatform" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.util" exported="" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/java/java-syntax/resources/intellij.java.syntax.xml b/java/java-syntax/resources/intellij.java.syntax.xml
new file mode 100644
index 000000000000..164f46cfcfb2
--- /dev/null
+++ b/java/java-syntax/resources/intellij.java.syntax.xml
@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index c97d477c1baa..d281cb083ed9 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -102,5 +102,7 @@
     <orderEntry type="module" module-name="intellij.java.codeserver.highlighting" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5.projectStructure" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.psi" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.syntax" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/plugin/intellij.java.plugin.iml b/java/plugin/intellij.java.plugin.iml
index 3a40e10dc61a..8bebedfe3f9f 100644
--- a/java/plugin/intellij.java.plugin.iml
+++ b/java/plugin/intellij.java.plugin.iml
@@ -34,5 +34,6 @@
     <orderEntry type="module" module-name="intellij.java.ui.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.performancePlugin" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.vcs" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.syntax" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/plugin/plugin-content.yaml b/java/plugin/plugin-content.yaml
index b3654930f037..6f11b796e2dd 100644
--- a/java/plugin/plugin-content.yaml
+++ b/java/plugin/plugin-content.yaml
@@ -17,6 +17,7 @@
   - name: intellij.java.frontback.psi.impl
   - name: intellij.java.frontback.impl
   - name: intellij.java.debugger.impl.shared
+  - name: intellij.java.syntax
 - name: lib/java-impl.jar
   projectLibraries:
   - name: netty-codec-protobuf
diff --git a/java/plugin/resources/META-INF/plugin.xml b/java/plugin/resources/META-INF/plugin.xml
index ea004449a5aa..10434465701e 100644
--- a/java/plugin/resources/META-INF/plugin.xml
+++ b/java/plugin/resources/META-INF/plugin.xml
@@ -45,6 +45,7 @@
     <module name="intellij.java.frontback.psi.impl" loading="embedded"/>
     <module name="intellij.java.frontback.impl" loading="embedded"/>
     <module name="intellij.java.debugger.impl.shared" loading="embedded"/>
+    <module name="intellij.java.syntax" loading="embedded"/>
   </content>
 
   <depends optional="true" config-file="intellij.java.remoteServers.impl.xml">com.intellij.modules.remoteServers</depends>
diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml
index 74cc612719f8..849ef5a01659 100644
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -42,6 +42,7 @@
     <orderEntry type="module" module-name="intellij.platform.backend.observation" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" />
     <orderEntry type="module" module-name="intellij.platform.debugger.testFramework" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/testFramework/shared/intellij.java.testFramework.shared.iml b/java/testFramework/shared/intellij.java.testFramework.shared.iml
index 3311dbcf4c1d..b2a9953b79cf 100644
--- a/java/testFramework/shared/intellij.java.testFramework.shared.iml
+++ b/java/testFramework/shared/intellij.java.testFramework.shared.iml
@@ -16,5 +16,6 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
 </module>
\ No newline at end of file