IJPL-185506: make intellij.xml.dom and intellij.xml.dom.impl v2

GitOrigin-RevId: 7cd032e07c7c610b0020728baf5732aa0199054d
2025-12-15 11:53:49 +07:00 · 2025-06-02 15:45:23 +02:00
parent 923eacddef
commit 17eb745163
11 changed files with 59 additions and 37 deletions
--- a/java/plugin/resources/META-INF/plugin.xml
+++ b/java/plugin/resources/META-INF/plugin.xml
@@ -16,6 +16,7 @@
    <plugin id="com.intellij.modules.xml"/>
    <plugin id="com.intellij.modules.java-capable"/>
    <module name="intellij.platform.vcs.impl.lang"/>
+    <module name="intellij.xml.dom.impl"/>
  </dependencies>

  <depends optional="true" config-file="java-copyright.xml">com.intellij.copyright</depends>
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -84,7 +84,6 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(

  "intellij.spellchecker",
  "intellij.platform.polySymbols",
-  "intellij.xml.dom.impl",

  "intellij.platform.vcs.log",

@@ -106,6 +105,7 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
  "intellij.platform.ide.favoritesTreeView",
  "intellij.platform.bookmarks",
  "intellij.platform.todo",
+  "intellij.libraries.cglib",
 )

@Suppress("RemoveRedundantQualifierName")
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -15,12 +15,7 @@
  </projectListeners>

  <xi:include href="/META-INF/XmlActions.xml"/>
-  <xi:include href="/META-INF/DomPlugin.xml">
-    <xi:fallback/>
-  </xi:include>
-  <xi:include href="/META-INF/relaxng-plugin.xml">
-    <xi:fallback/>
-  </xi:include>
+
  <xi:include href="/META-INF/XmlAnalysisImpl.xml">
    <xi:fallback/>
  </xi:include>
--- a/platform/platform-resources/src/META-INF/common-ide-modules.xml
+++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml
@@ -25,7 +25,6 @@
    <module name="intellij.platform.diagnostic.freezeAnalyzer"/>
    <module name="intellij.platform.diagnostic.freezes"/>
    <module name="intellij.platform.warmup"/>
-    <module name="intellij.relaxng"/>
    <module name="intellij.settingsSync.core"/>
    <module name="intellij.spellchecker.xml"/>
    <module name="intellij.emojipicker"/>
@@ -34,5 +33,6 @@

  <xi:include href="/META-INF/grid-core-modules.xml"/>
  <xi:include href="/META-INF/vcs-modules.xml"/>
+  <xi:include href="/META-INF/xml-modules.xml"/>

 </idea-plugin>
--- a/platform/platform-resources/src/META-INF/xml-modules.xml
+++ b/platform/platform-resources/src/META-INF/xml-modules.xml
@@ -0,0 +1,7 @@
+<idea-plugin>
+  <content>
+    <module name="intellij.xml.dom" loading="embedded"/>
+    <module name="intellij.xml.dom.impl" loading="embedded"/>
+    <module name="intellij.relaxng"/>
+  </content>
+</idea-plugin>
--- a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
+++ b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
@@ -22,11 +22,12 @@ open class PyCharmCommunityProperties(protected val communityHome: Path) : PyCha
    scrambleMainJar = false
    buildSourcesArchive = true

-    productLayout.productApiModules = listOf("intellij.xml.dom")
+    productLayout.productApiModules = listOf()
    productLayout.productImplementationModules = listOf(
      "intellij.platform.starter",
      "intellij.pycharm.community",
-      "intellij.platform.whatsNew"
+      "intellij.platform.whatsNew",
+      "intellij.xml.impl",
    )
    productLayout.bundledPluginModules +=
      sequenceOf(
--- a/xml/dom-impl/BUILD.bazel
+++ b/xml/dom-impl/BUILD.bazel
@@ -35,6 +35,9 @@ jvm_library(
    "//platform/libraries/cglib",
  ],
  exports = ["//xml/dom-openapi:dom"],
-  runtime_deps = [":dom-impl_resources"]
+  runtime_deps = [
+    ":dom-impl_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.xml.dom.impl` end
--- a/xml/dom-impl/intellij.xml.dom.impl.iml
+++ b/xml/dom-impl/intellij.xml.dom.impl.iml
@@ -28,6 +28,7 @@
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.libraries.cglib" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
  </component>
  <component name="copyright">
    <Base>
--- a/xml/dom-impl/resources/intellij.xml.dom.impl.xml
+++ b/xml/dom-impl/resources/intellij.xml.dom.impl.xml
@@ -1,8 +1,10 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.xml.dom"/>
+    <module name="intellij.platform.backend"/>
+  </dependencies>
+
  <extensionPoints>
-    <extensionPoint name="dom.fileDescription"
-                    interface="com.intellij.util.xml.DomFileDescription"
-                    dynamic="true"/>
    <extensionPoint name="dom.fileMetaData"
                    beanClass="com.intellij.util.xml.impl.DomFileMetaData"
                    dynamic="true">
@@ -26,28 +28,8 @@
      <with attribute="domClass" implements="com.intellij.util.xml.DomElement"/>
      <with attribute="extenderClass" implements="com.intellij.util.xml.reflect.DomExtender"/>
    </extensionPoint>
-
-    <extensionPoint name="dom.customAnnotationChecker"
-                    interface="com.intellij.util.xml.highlighting.DomCustomAnnotationChecker"
-                    dynamic="true"/>
-
-    <extensionPoint name="dom.uiControlsProvider"
-                    interface="com.intellij.util.Consumer"/>
-
-    <extensionPoint name="moduleContextProvider" interface="com.intellij.util.xml.ModuleContextProvider" dynamic="true"/>
-    <extensionPoint name="dom.gotoSuper" interface="com.intellij.util.xml.DomElementNavigationProvider" dynamic="true"/>
  </extensionPoints>

-  <actions resource-bundle="messages.XmlDomBundle">
-    <group id="DomCollectionControl">
-      <action id="DomCollectionControl.Add" class="com.intellij.util.xml.ui.DomCollectionControl$AddAction">
-        <keyboard-shortcut first-keystroke="INSERT" keymap="$default"/>
-      </action>
-      <action id="DomCollectionControl.Edit" class="com.intellij.util.xml.ui.DomCollectionControl$EditAction" use-shortcut-of="EditSource"/>
-      <action id="DomCollectionControl.Remove" class="com.intellij.util.xml.ui.DomCollectionControl$RemoveAction" use-shortcut-of="$Delete"/>
-    </group>
-  </actions>
-
  <extensions defaultExtensionNs="com.intellij">
    <codeInsight.gotoSuper language="XML" implementationClass="com.intellij.codeInsight.navigation.DomGotoSuperHandler"/>

@@ -70,8 +52,6 @@
    <applicationService serviceInterface="com.intellij.util.xml.ConverterManager"
                        serviceImplementation="com.intellij.util.xml.impl.ConverterManagerImpl"/>

-    <projectService serviceImplementation="com.intellij.util.xml.ui.CommittableUtil"/>
-
    <projectService serviceInterface="com.intellij.util.xml.highlighting.DomElementAnnotationsManager"
                    serviceImplementation="com.intellij.util.xml.highlighting.DomElementAnnotationsManagerImpl"/>

@@ -104,7 +84,6 @@
    <iconProvider implementation="com.intellij.util.xml.impl.DefaultDomTargetIconProvider" id="domDefault" order="last"/>
    <iconProvider implementation="com.intellij.util.xml.DomFileIconProvider" id="domFileDefault" order="last"/>

-    <patterns.patternClass className="com.intellij.patterns.DomPatterns" alias="dom"/>
    <xmlStructureViewBuilderProvider implementation="com.intellij.util.xml.structure.DomStructureViewBuilderProvider" order="last"/>
  </extensions>
 </idea-plugin>
--- a/xml/dom-openapi/resources/intellij.xml.dom.xml
+++ b/xml/dom-openapi/resources/intellij.xml.dom.xml
@@ -0,0 +1,33 @@
+<idea-plugin>
+  <extensionPoints>
+    <extensionPoint name="dom.customAnnotationChecker"
+                    interface="com.intellij.util.xml.highlighting.DomCustomAnnotationChecker"
+                    dynamic="true"/>
+    <extensionPoint name="dom.gotoSuper" interface="com.intellij.util.xml.DomElementNavigationProvider" dynamic="true"/>
+
+    <extensionPoint name="dom.uiControlsProvider"
+                    interface="com.intellij.util.Consumer"/>
+
+    <extensionPoint name="dom.fileDescription"
+                    interface="com.intellij.util.xml.DomFileDescription"
+                    dynamic="true"/>
+
+    <extensionPoint name="moduleContextProvider" interface="com.intellij.util.xml.ModuleContextProvider" dynamic="true"/>
+  </extensionPoints>
+
+  <actions resource-bundle="messages.XmlDomBundle">
+    <group id="DomCollectionControl">
+      <action id="DomCollectionControl.Add" class="com.intellij.util.xml.ui.DomCollectionControl$AddAction">
+        <keyboard-shortcut first-keystroke="INSERT" keymap="$default"/>
+      </action>
+      <action id="DomCollectionControl.Edit" class="com.intellij.util.xml.ui.DomCollectionControl$EditAction" use-shortcut-of="EditSource"/>
+      <action id="DomCollectionControl.Remove" class="com.intellij.util.xml.ui.DomCollectionControl$RemoveAction" use-shortcut-of="$Delete"/>
+    </group>
+  </actions>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <projectService serviceImplementation="com.intellij.util.xml.ui.CommittableUtil"/>
+
+    <patterns.patternClass className="com.intellij.patterns.DomPatterns" alias="dom"/>
+  </extensions>
+</idea-plugin>
--- a/xml/relaxng/resources/intellij.relaxng.xml
+++ b/xml/relaxng/resources/intellij.relaxng.xml
@@ -1,8 +1,10 @@
 <idea-plugin>
  <module value="com.intellij.modules.relaxng"/>
  <dependencies>
+    <module name="intellij.xml.dom.impl"/>
    <module name="intellij.platform.backend"/>
  </dependencies>
+
  <extensions defaultExtensionNs="com.intellij">
    <gotoSymbolContributor implementation="org.intellij.plugins.relaxNG.GotoSymbolContributor" />