IJPL-185506: include psi & psi.impl as content modules, add some missing backend dependencies

GitOrigin-RevId: b74ac7059d3ca6e1f43fd4168c84737db2d95752

platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt

@@ -47,7 +47,6 @@ private val PLATFORM_API_MODULES = java.util.List.of(
   "intellij.platform.usageView",
   "intellij.platform.execution",
   "intellij.xml",
-  "intellij.xml.psi",
   "intellij.platform.kernel",
 )
 

platform/platform-resources/src/META-INF/XmlPlugin.xml

@@ -5,8 +5,6 @@
   <xi:include href="/META-INF/XmlImpl.xml"/>
 
   <xi:include href="/META-INF/XmlAnalysisImpl.xml"/>
-  <xi:include href="/META-INF/XmlPsiImpl.xml"/>
-  <xi:include href="/META-INF/XmlPsi.xml"/>
 
   <extensionPoints>
     <extensionPoint name="xml.xmlTagRuleProvider" interface="com.intellij.xml.XmlTagRuleProvider" dynamic="true"/>

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

@@ -4,6 +4,8 @@
     <module name="intellij.xml.dom.impl" loading="embedded"/>
     <module name="intellij.xml.structureView" loading="embedded"/>
     <module name="intellij.xml.structureView.impl" loading="embedded"/>
+    <module name="intellij.xml.psi" loading="embedded"/>
+    <module name="intellij.xml.psi.impl" loading="embedded"/>
     <module name="intellij.relaxng"/>
   </content>
 </idea-plugin>

plugins/textmate/core/BUILD.bazel

@@ -22,7 +22,8 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "@lib//:slf4j-api",
     "@lib//:kotlinx-collections-immutable",
-  ]
+  ],
+  runtime_deps = ["//platform/backend"]
 )
 
 jvm_library(

plugins/textmate/core/intellij.textmate.core.iml

@@ -45,5 +45,6 @@
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

xml/dom-openapi/BUILD.bazel

@@ -25,6 +25,9 @@ jvm_library(
     "//xml/xml-psi-api:psi",
     "//platform/core-ui",
   ],
-  runtime_deps = [":dom_resources"]
+  runtime_deps = [
+    ":dom_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.xml.dom` end

xml/dom-openapi/intellij.xml.dom.iml

@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
   <component name="copyright">
     <Base>

xml/dom-openapi/resources/intellij.xml.dom.xml

@@ -1,4 +1,8 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.platform.backend"/>
+  </dependencies>
+
   <extensionPoints>
     <extensionPoint name="dom.customAnnotationChecker"
                     interface="com.intellij.util.xml.highlighting.DomCustomAnnotationChecker"

xml/impl/BUILD.bazel

@@ -54,6 +54,9 @@ jvm_library(
     "//xml/xml-analysis-impl:analysis-impl",
     "//xml/xml-structure-view-impl:structureView-impl",
   ],
-  runtime_deps = [":impl_resources"]
+  runtime_deps = [
+    ":impl_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.xml.impl` end

xml/impl/intellij.xml.impl.iml

@@ -42,6 +42,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="library" name="aalto-xml" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
   <component name="copyright">
     <Base>

xml/xml-analysis-api/BUILD.bazel

@@ -20,6 +20,9 @@ jvm_library(
     "//platform/util",
   ],
   exports = ["//platform/extensions"],
-  runtime_deps = [":analysis_resources"]
+  runtime_deps = [
+    ":analysis_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.xml.analysis` end

xml/xml-analysis-api/intellij.xml.analysis.iml

@@ -13,5 +13,6 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

xml/xml-analysis-impl/BUILD.bazel

@@ -31,6 +31,9 @@ jvm_library(
     "//platform/indexing-api:indexing",
   ],
   exports = ["//xml/xml-analysis-api:analysis"],
-  runtime_deps = [":analysis-impl_resources"]
+  runtime_deps = [
+    ":analysis-impl_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.xml.analysis.impl` end

xml/xml-analysis-impl/intellij.xml.analysis.impl.iml

@@ -24,5 +24,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

xml/xml-psi-api/BUILD.bazel

@@ -21,6 +21,9 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "@lib//:kotlin-stdlib",
   ],
-  runtime_deps = [":psi_resources"]
+  runtime_deps = [
+    ":psi_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.xml.psi` end

xml/xml-psi-api/intellij.xml.psi.iml

@@ -15,5 +15,6 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

xml/xml-psi-api/resources/intellij.xml.psi.xml

@@ -1,4 +1,8 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.platform.backend"/>
+  </dependencies>
+
   <extensionPoints>
     <extensionPoint name="xml.schemaProvider" interface="com.intellij.xml.XmlSchemaProvider" dynamic="true"/>
     <extensionPoint name="xml.xmlTypedHandlersAdditionalSupport" interface="com.intellij.openapi.editor.XmlTypedHandlersAdditionalSupport" dynamic="true"/>

xml/xml-psi-impl/BUILD.bazel

@@ -47,6 +47,7 @@ jvm_library(
   runtime_deps = [
     ":psi-impl_resources",
     ":psi-impl_resources_1",
+    "//platform/backend",
   ]
 )
 ### auto-generated section `build intellij.xml.psi.impl` end

xml/xml-psi-impl/intellij.xml.psi.impl.iml

@@ -34,5 +34,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.polySymbols" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml

@@ -1,4 +1,9 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.platform.backend"/>
+    <module name="intellij.xml.psi"/>
+  </dependencies>
+
   <projectListeners>
     <listener class="com.intellij.html.polySymbols.HtmlPolyContextChangeListener"
               topic="com.intellij.polySymbols.context.PolyContextChangeListener"/>

xml/xml-structure-view-api/BUILD.bazel

@@ -1,5 +1,11 @@
 ### auto-generated section `build intellij.xml.structureView` start
-load("@rules_jvm//:jvm.bzl", "jvm_library")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "structureView_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
 
 jvm_library(
   name = "structureView",
@@ -11,6 +17,10 @@ jvm_library(
     "//platform/util",
     "//xml/xml-psi-api:psi",
     "//platform/editor-ui-api:editor-ui",
+  ],
+  runtime_deps = [
+    ":structureView_resources",
+    "//platform/backend",
   ]
 )
 ### auto-generated section `build intellij.xml.structureView` end

xml/xml-structure-view-api/intellij.xml.structureView.iml

@@ -12,5 +12,6 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

xml/xml-structure-view-api/resources/intellij.xml.structureView.xml

@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.xml.psi"/>
   </dependencies>
 
   <extensionPoints>

xml/xml-structure-view-impl/BUILD.bazel

@@ -23,6 +23,9 @@ jvm_library(
     "//xml/xml-parser:parser",
     "//platform/lang-impl",
   ],
-  runtime_deps = [":structureView-impl_resources"]
+  runtime_deps = [
+    ":structureView-impl_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.xml.structureView.impl` end

xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml

@@ -17,5 +17,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml

@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.xml.structureView"/>
+    <module name="intellij.xml.psi.impl"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">