From 34c72f2cdf33c7d74df6aae2b3845bbd38fcfb50 Mon Sep 17 00:00:00 2001
From: Maria Filipanova <maria.filipanova@jetbrains.com>
Date: Wed, 4 Jun 2025 16:36:08 +0200
Subject: [PATCH] IJPL-185506: structure view modules as content ones

GitOrigin-RevId: 35d7101b8f71f2d963aecae897563cd4eb8b3f5c
---
 .../intellij/build/impl/PlatformModules.kt        |  1 -
 .../platform-resources/src/META-INF/XmlPlugin.xml | 10 ----------
 .../src/META-INF/xml-modules.xml                  |  2 ++
 .../intellij.xml.structureView.iml                |  1 +
 .../resources/intellij.xml.structureView.xml      | 15 +++++++++++++++
 xml/xml-structure-view-impl/BUILD.bazel           | 11 +++++++++--
 .../intellij.xml.structureView.impl.iml           |  1 +
 .../resources/intellij.xml.structureView.impl.xml | 14 ++++++++++++++
 8 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 xml/xml-structure-view-api/resources/intellij.xml.structureView.xml
 create mode 100644 xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml

diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index e5a4af81a4a7..5e68811391d2 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -48,7 +48,6 @@ private val PLATFORM_API_MODULES = java.util.List.of(
   "intellij.platform.execution",
   "intellij.xml",
   "intellij.xml.psi",
-  "intellij.xml.structureView",
   "intellij.platform.kernel",
 )
 
diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 25a32d98c46a..860928e4effa 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -9,10 +9,6 @@
   <xi:include href="/META-INF/XmlPsi.xml"/>
 
   <extensionPoints>
-    <extensionPoint name="xmlStructureViewElementProvider" interface="com.intellij.ide.structureView.xml.XmlStructureViewElementProvider" dynamic="true"/>
-
-    <extensionPoint name="xmlStructureViewBuilderProvider" interface="com.intellij.ide.structureView.xml.XmlStructureViewBuilderProvider" dynamic="true"/>
-
     <extensionPoint name="xml.xmlTagRuleProvider" interface="com.intellij.xml.XmlTagRuleProvider" dynamic="true"/>
     <extensionPoint name="embeddedTokenTypesProvider" interface="com.intellij.lexer.EmbeddedTokenTypesProvider" dynamic="true"/>
     <extensionPoint name="embeddedTokenHighlighter" interface="com.intellij.ide.highlighter.EmbeddedTokenHighlighter" dynamic="true"/>
@@ -48,10 +44,6 @@
 
     <syntax.elementTypeConverter language="XML" implementationClass="com.intellij.psi.xml.XmlElementTypeConverterExtension"/>
 
-    <lang.psiStructureViewFactory language="DTD" implementationClass="com.intellij.lang.dtd.DtdStructureViewBuilderFactory"/>
-    <lang.psiStructureViewFactory language="XML" implementationClass="com.intellij.lang.xml.XmlStructureViewBuilderFactory"/>
-    <lang.psiStructureViewFactory language="HTML" implementationClass="com.intellij.lang.xml.XmlStructureViewBuilderFactory"/>
-    <lang.psiStructureViewFactory language="XHTML" implementationClass="com.intellij.lang.xml.XmlStructureViewBuilderFactory"/>
 
     <syntaxHighlighter key="IDEA_PROJECT" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
     <syntaxHighlighter key="IDEA_MODULE" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
@@ -60,8 +52,6 @@
     <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.XMLColorsPage"/>
     <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.HTMLColorsPage"/>
 
-    <xmlStructureViewBuilderProvider implementation="com.intellij.lang.html.structureView.HtmlStructureViewBuilderProvider"/>
-
     <polySymbols.enableInLanguage language="HtmlCompatible"/>
 
     <polySymbols.inspectionToolMapping symbolNamespace="html" symbolKind="attributes" problemKind="UnknownSymbol"
diff --git a/platform/platform-resources/src/META-INF/xml-modules.xml b/platform/platform-resources/src/META-INF/xml-modules.xml
index e2269637c9b9..5dd6cd9f28f6 100644
--- a/platform/platform-resources/src/META-INF/xml-modules.xml
+++ b/platform/platform-resources/src/META-INF/xml-modules.xml
@@ -2,6 +2,8 @@
   <content>
     <module name="intellij.xml.dom" loading="embedded"/>
     <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.relaxng"/>
   </content>
 </idea-plugin>
\ No newline at end of file
diff --git a/xml/xml-structure-view-api/intellij.xml.structureView.iml b/xml/xml-structure-view-api/intellij.xml.structureView.iml
index 6560be60229b..ce192b3b8b75 100644
--- a/xml/xml-structure-view-api/intellij.xml.structureView.iml
+++ b/xml/xml-structure-view-api/intellij.xml.structureView.iml
@@ -3,6 +3,7 @@
   <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" />
diff --git a/xml/xml-structure-view-api/resources/intellij.xml.structureView.xml b/xml/xml-structure-view-api/resources/intellij.xml.structureView.xml
new file mode 100644
index 000000000000..17069d397cb9
--- /dev/null
+++ b/xml/xml-structure-view-api/resources/intellij.xml.structureView.xml
@@ -0,0 +1,15 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.platform.backend"/>
+  </dependencies>
+
+  <extensionPoints>
+    <extensionPoint name="xmlStructureViewBuilderProvider"
+                    interface="com.intellij.ide.structureView.xml.XmlStructureViewBuilderProvider"
+                    dynamic="true"/>
+
+    <extensionPoint name="xmlStructureViewElementProvider"
+                    interface="com.intellij.ide.structureView.xml.XmlStructureViewElementProvider"
+                    dynamic="true"/>
+  </extensionPoints>
+</idea-plugin>
\ No newline at end of file
diff --git a/xml/xml-structure-view-impl/BUILD.bazel b/xml/xml-structure-view-impl/BUILD.bazel
index 10457ae002bf..05963a5c14f1 100644
--- a/xml/xml-structure-view-impl/BUILD.bazel
+++ b/xml/xml-structure-view-impl/BUILD.bazel
@@ -1,5 +1,11 @@
 ### auto-generated section `build intellij.xml.structureView.impl` start
-load("@rules_jvm//:jvm.bzl", "jvm_library")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "structureView-impl_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
 
 jvm_library(
   name = "structureView-impl",
@@ -16,6 +22,7 @@ jvm_library(
     "//platform/util:util-ui",
     "//xml/xml-parser:parser",
     "//platform/lang-impl",
-  ]
+  ],
+  runtime_deps = [":structureView-impl_resources"]
 )
 ### auto-generated section `build intellij.xml.structureView.impl` end
\ No newline at end of file
diff --git a/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml b/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
index e1ee5f26d49a..9829130a12b4 100644
--- a/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
+++ b/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
@@ -3,6 +3,7 @@
   <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" />
diff --git a/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml b/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
new file mode 100644
index 000000000000..01f062817656
--- /dev/null
+++ b/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
@@ -0,0 +1,14 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.xml.structureView"/>
+  </dependencies>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <lang.psiStructureViewFactory language="DTD" implementationClass="com.intellij.lang.dtd.DtdStructureViewBuilderFactory"/>
+    <lang.psiStructureViewFactory language="XML" implementationClass="com.intellij.lang.xml.XmlStructureViewBuilderFactory"/>
+    <lang.psiStructureViewFactory language="HTML" implementationClass="com.intellij.lang.xml.XmlStructureViewBuilderFactory"/>
+    <lang.psiStructureViewFactory language="XHTML" implementationClass="com.intellij.lang.xml.XmlStructureViewBuilderFactory"/>
+
+    <xmlStructureViewBuilderProvider implementation="com.intellij.lang.html.structureView.HtmlStructureViewBuilderProvider"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file