IJ-MR-162467 don't export intellij.xml.psi

GitOrigin-RevId: d4ca928b7dc468451c0047bd35f1f60c1199207a

images/backend.svg/BUILD.bazel

@@ -16,6 +16,7 @@ jvm_library(
     "//images",
     "@lib//:kotlin-stdlib",
     "//xml/xml-parser:parser",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//platform/lang-api:lang",
     "//platform/core-impl",

images/backend.svg/intellij.platform.images.backend.svg.iml

@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.images" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.xml.parser" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />

java/compiler/impl/BUILD.bazel

@@ -66,6 +66,7 @@ jvm_library(
     "@lib//:kotlinx-collections-immutable",
     "@lib//:netty-codec-protobuf",
     "//platform/eel-provider",
+    "//xml/xml-psi-api:psi",
   ],
   exports = ["//java/compiler/openapi:java-compiler"]
 )

java/compiler/impl/intellij.java.compiler.impl.iml

@@ -66,6 +66,7 @@
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
     <orderEntry type="library" name="netty-codec-protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.java.testFramework.shared" scope="TEST" />
   </component>
   <component name="copyright">

java/debugger/impl/BUILD.bazel

@@ -56,6 +56,7 @@ jvm_library(
     "//java/debugger/shared",
     "//platform/eel-provider",
     "//java/codeserver/highlighting",
+    "//xml/xml-psi-api:psi",
     "//platform/xdebugger-impl/shared",
   ],
   runtime_deps = [":impl_resources"]

java/debugger/impl/intellij.java.debugger.impl.iml

@@ -89,6 +89,7 @@
     <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
     <orderEntry type="module" module-name="intellij.java.codeserver.highlighting" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.shared" />
   </component>
   <component name="copyright">

java/debugger/openapi/BUILD.bazel

@@ -25,6 +25,7 @@ jvm_library(
     "//platform/xdebugger-api:debugger",
     "//platform/core-ui",
     "//platform/platform-util-io:ide-util-io",
+    "//xml/xml-psi-api:psi",
     "@lib//:kotlin-stdlib",
   ],
   exports = ["//platform/xdebugger-api:debugger"],

java/debugger/openapi/intellij.java.debugger.iml

@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.debugger" exported="" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
   </component>
   <component name="copyright">

java/idea-ui/BUILD.bazel

@@ -54,6 +54,7 @@ jvm_library(
     "@lib//:maven-resolver-provider",
     "//java/java-syntax:syntax",
     "@lib//:slf4j-api",
+    "//xml/xml-psi-api:psi",
     "@lib//:asm",
   ],
   runtime_deps = [":ui_resources"]
@@ -104,6 +105,7 @@ jvm_library(
     "//platform/testFramework/junit5/eel:eel_test_lib",
     "//platform/eel-provider",
     "//platform/workspace/storage",
+    "//xml/xml-psi-api:psi",
     "//libraries/io",
   ]
 )

java/idea-ui/intellij.java.ui.iml

@@ -50,6 +50,7 @@
     <orderEntry type="library" name="maven-resolver-provider" level="project" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="library" name="slf4j-api" level="project" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="library" name="ASM" level="project" />
   </component>
 </module>

java/idea-ui/intellij.java.ui.tests.iml

@@ -33,6 +33,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5.eel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.io" scope="TEST" />
   </component>
 </module>

java/java-analysis-impl/BUILD.bazel

@@ -23,6 +23,7 @@ jvm_library(
     "//platform/projectModel-impl",
     "//java/java-analysis-api:analysis",
     "//resources-en:java-resources-en",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//platform/platform-api:ide",
     "@lib//:asm",

java/java-analysis-impl/intellij.java.analysis.impl.iml

@@ -18,6 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
     <orderEntry type="module" module-name="intellij.java.analysis" exported="" />
     <orderEntry type="module" module-name="intellij.java.resources.en" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" name="ASM" level="project" />

java/java-impl-refactorings/BUILD.bazel

@@ -34,6 +34,7 @@ jvm_library(
     "//platform/usageView-impl",
     "//platform/util/jdom",
     "//platform/core-ui",
+    "//xml/xml-psi-api:psi",
     "//java/codeserver/core",
   ]
 )

java/java-impl-refactorings/intellij.java.impl.refactorings.iml

@@ -34,6 +34,7 @@
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
   </component>
 </module>

java/java-impl/BUILD.bazel

@@ -83,6 +83,7 @@ jvm_library(
     "//platform/todo",
     "//java/codeserver/highlighting",
     "//java/codeserver/core",
+    "//xml/xml-psi-api:psi",
     "//java/java-syntax:syntax",
   ],
   exports = [

java/java-impl/intellij.java.impl.iml

@@ -98,6 +98,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.xml.psi" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
   <component name="copyright">

java/java-tests/BUILD.bazel

@@ -78,6 +78,7 @@ jvm_library(
     "@lib//:mockito",
     "@lib//:assert_j",
     "//xml/xml-analysis-impl:analysis-impl",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "@lib//:kotlin-test",
     "//platform/built-in-server-api:builtInServer",

java/java-tests/intellij.java.tests.iml

@@ -63,6 +63,7 @@
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.xml.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" scope="TEST" />

java/jsp-base-openapi/BUILD.bazel

@@ -9,6 +9,7 @@ jvm_library(
   deps = [
     "//platform/platform-api:ide",
     "//xml/openapi:xml",
+    "//xml/xml-psi-api:psi",
     "//platform/lang-api:lang",
   ],
   exports = ["//xml/openapi:xml"]

java/jsp-base-openapi/intellij.jsp.base.iml

@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.xml" exported="" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
 </module>

java/jsp-openapi/BUILD.bazel

@@ -9,6 +9,7 @@ jvm_library(
   deps = [
     "//java/java-psi-api:psi",
     "//platform/util",
+    "//xml/xml-psi-api:psi",
     "//java/jsp-base-openapi:jsp-base",
   ],
   exports = ["//java/jsp-base-openapi:jsp-base"]

java/jsp-openapi/intellij.jsp.iml

@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.jsp.base" exported="" />
   </component>
 </module>

java/jsp-spi/BUILD.bazel

@@ -11,6 +11,7 @@ jvm_library(
     "//java/openapi:java",
     "//platform/analysis-api:analysis",
     "//jps/model-api:model",
+    "//xml/xml-psi-api:psi",
     "//java/jsp-base-openapi:jsp-base",
   ],
   exports = [

java/jsp-spi/intellij.jsp.spi.iml

@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.java" exported="" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.jsp.base" />
   </component>
   <component name="copyright">

java/openapi/BUILD.bazel

@@ -47,6 +47,7 @@ jvm_library(
     "//platform/external-system-api:externalSystem",
     "//platform/workspace/jps",
     "//platform/backend/workspace",
+    "//xml/xml-psi-api:psi",
     "@lib//:kotlin-stdlib",
     ":java-guiForms-rt_provided",
   ],

java/openapi/intellij.java.iml

@@ -33,6 +33,7 @@
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
   </component>
   <component name="copyright">

java/testFramework/BUILD.bazel

@@ -51,6 +51,7 @@ jvm_library(
     "//platform/backend/observation",
     "//java/debugger/shared",
     "//platform/xdebugger-testFramework:debugger-testFramework",
+    "//xml/xml-psi-api:psi",
     "//java/java-syntax:syntax",
   ],
   exports = [

java/testFramework/intellij.java.testFramework.iml

@@ -49,6 +49,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.xml.psi" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>
   <component name="copyright">

platform/external-system-api/dependency-updater/BUILD.bazel

@@ -51,6 +51,7 @@ jvm_library(
     "//plugins/gradle/gradle-dependency-updater:dependencyUpdater",
     "//plugins/maven",
     "//plugins/maven/testFramework",
+    "//xml/xml-psi-api:psi",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
   ],

platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.tests.iml

@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="intellij.gradle.dependencyUpdater" scope="TEST" />
     <orderEntry type="module" module-name="intellij.maven" scope="TEST" />
     <orderEntry type="module" module-name="intellij.maven.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
   </component>
 </module>

platform/platform-tests/BUILD.bazel

@@ -153,6 +153,7 @@ jvm_library(
     "//platform/plugins/parser/impl",
     "//platform/platform-impl/eel:ide-impl-wsl",
     "//platform/syntax/syntax-psi-tests:psi-tests_test_lib",
+    "//xml/xml-psi-api:psi",
     "//platform/runtime/product",
   ],
   runtime_deps = [

platform/platform-tests/intellij.platform.tests.iml

@@ -135,6 +135,7 @@
     <orderEntry type="module" module-name="intellij.platform.plugins.parser.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl.wsl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.runtime.product" scope="TEST" />
   </component>
 </module>

platform/structuralsearch/BUILD.bazel

@@ -32,6 +32,7 @@ jvm_library(
     "//platform/duplicates-analysis",
     "//platform/lang-impl",
     "//platform/core-ui",
+    "//xml/xml-psi-api:psi",
     "@lib//:fastutil-min",
   ],
   exports = ["//platform/duplicates-analysis"],

platform/structuralsearch/intellij.platform.structuralSearch.iml

@@ -27,6 +27,7 @@
     <orderEntry type="module" module-name="intellij.platform.duplicates.analysis" exported="" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="library" name="fastutil-min" level="project" />
   </component>
   <component name="copyright">

plugins/IntelliLang/xml-support/BUILD.bazel

@@ -24,6 +24,7 @@ jvm_library(
     "//platform/lang-impl",
     "//xml/impl",
     "//RegExpSupport:regexp",
+    "//xml/xml-psi-api:psi",
     "//platform/platform-api:ide",
     "@lib//:jaxen",
     "//plugins/IntelliLang:langInjection",

plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml

@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.regexp" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xpath" scope="PROVIDED" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" name="Jaxen" level="project" />

plugins/ant/BUILD.bazel

@@ -48,6 +48,7 @@ jvm_library(
     "//plugins/properties/properties-psi-impl:backend-psi",
     "//platform/platform-util-io:ide-util-io",
     "//platform/util/jdom",
+    "//xml/xml-psi-api:psi",
   ],
   runtime_deps = [":ant_resources"]
 )
@@ -101,6 +102,7 @@ jvm_library(
     "//platform/util/jdom",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
+    "//xml/xml-psi-api:psi",
     "//xml/testFramework",
   ],
   runtime_deps = [":ant_resources"]

plugins/ant/intellij.ant.iml

@@ -48,6 +48,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.testFramework" scope="TEST" />
   </component>
   <component name="copyright">

plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel

@@ -20,6 +20,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//platform/refactoring",
     "//platform/usageView-impl",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/gradle/gradle-tooling/impl",
     "//plugins/kotlin/base/project-model",
     "//plugins/kotlin/base/facet",
@@ -57,6 +58,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//platform/refactoring",
     "//platform/usageView-impl",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/gradle/gradle-tooling/impl",
     "//plugins/kotlin/gradle/gradle-tooling/impl:impl_test_lib",
     "//plugins/kotlin/base/project-model",

plugins/compose/intellij.compose.ide.plugin.resources/intellij.compose.ide.plugin.resources.iml

@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-tooling.impl" />
     <orderEntry type="module" module-name="kotlin.base.project-model" />
     <orderEntry type="module" module-name="kotlin.base.facet" />

plugins/copyright/BUILD.bazel

@@ -27,6 +27,7 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "//platform/external-system-api:externalSystem",
     "//platform/core-ui",
+    "//xml/xml-psi-api:psi",
     "//platform/util/jdom",
   ],
   runtime_deps = [":copyright_resources"]
@@ -59,6 +60,7 @@ jvm_library(
     "@lib//:assert_j",
     "//platform/core-ui",
     "@lib//:junit5",
+    "//xml/xml-psi-api:psi",
     "//platform/util/jdom",
   ],
   runtime_deps = [":copyright_resources"]

plugins/copyright/intellij.copyright.iml

@@ -28,6 +28,7 @@
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
   </component>
 </module>

plugins/devkit/devkit-core/BUILD.bazel

@@ -46,6 +46,7 @@ jvm_library(
     "//plugins/properties/properties-psi-api:psi",
     "//platform/lang-impl",
     "//xml/dom-impl",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-structure-view-api:structureView",
     "//uast/uast-common:uast",
     "//java/idea-ui:ui",

plugins/devkit/devkit-core/intellij.devkit.core.iml

@@ -57,6 +57,7 @@
     <orderEntry type="module" module-name="intellij.properties.psi" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.xml.dom.impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.structureView" />
     <orderEntry type="module" module-name="intellij.platform.uast" />
     <orderEntry type="module" module-name="intellij.java.ui" />

plugins/devkit/devkit-java-tests/BUILD.bazel

@@ -26,6 +26,7 @@ jvm_library(
     "//jps/model-api:model",
     "//platform/refactoring",
     "//platform/structure-view-impl:structureView-impl",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//spellchecker",
     "//spellchecker:spellchecker_test_lib",

plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml

@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.analysis.impl" scope="TEST" />

plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel

@@ -11,6 +11,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-code-insight-k2",
     "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-code-insight-k2_test_lib",
     "//plugins/devkit",

plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml

@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.code-insight.k2" />
     <orderEntry type="module" module-name="intellij.devkit" />
     <orderEntry type="module" module-name="intellij.devkit.core" />

plugins/devkit/devkit-kotlin-tests/BUILD.bazel

@@ -43,6 +43,7 @@ jvm_library(
     "//platform/testRunner:testRunner_test_lib",
     "@lib//:kotlin-test",
     "//plugins/devkit/devkit-core:core",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/base/test:test_test_lib",
     "//plugins/kotlin/test-framework:test-framework_test_lib",
     "//plugins/kotlin/base/plugin",

plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml

@@ -29,6 +29,7 @@
     <orderEntry type="module" module-name="intellij.kotlin.devkit" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.devkit.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />

plugins/devkit/devkit-tests/BUILD.bazel

@@ -29,6 +29,7 @@ jvm_library(
     "//java/compiler/openapi:java-compiler",
     "//jvm/jvm-analysis-api:analysis",
     "//xml/xml-analysis-impl:analysis-impl",
+    "//xml/xml-psi-api:psi",
     "//spellchecker",
     "//spellchecker:spellchecker_test_lib",
   ]

plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml

@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.jvm.analysis" />
     <orderEntry type="module" module-name="intellij.xml.analysis.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
   </component>
   <component name="TestModuleProperties" production-module="intellij.devkit.core" />

plugins/grazie/xml/BUILD.bazel

@@ -15,6 +15,7 @@ jvm_library(
   deps = [
     "@lib//:kotlin-stdlib",
     "//plugins/grazie/src:core",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//platform/core-api:core",
     "//platform/util",

plugins/grazie/xml/intellij.grazie.xml.iml

@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.grazie.core" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.util" />

plugins/groovy/BUILD.bazel

@@ -74,6 +74,7 @@ jvm_library(
     "//platform/util/jdom",
     "//platform/workspace/jps",
     "//platform/backend/workspace",
+    "//xml/xml-psi-api:psi",
     "//java/unscramble",
     ":ant_provided",
     ":java-byteCodeViewer_provided",
@@ -160,6 +161,7 @@ jvm_library(
     "//platform/backend/workspace",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
+    "//xml/xml-psi-api:psi",
     "//java/unscramble",
   ],
   runtime_deps = [":groovy_resources"]

plugins/groovy/groovy-psi/BUILD.bazel

@@ -27,6 +27,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/structure-view-impl:structureView-impl",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//platform/editor-ui-ex:editor-ex",
     "//java/java-analysis-impl:analysis-impl",

plugins/groovy/groovy-psi/intellij.groovy.psi.iml

@@ -25,6 +25,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.java.analysis.impl" />

plugins/groovy/intellij.groovy.iml

@@ -72,6 +72,7 @@
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.java.unscramble" />
   </component>
 </module>

plugins/htmltools/BUILD.bazel

@@ -24,6 +24,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//xml/xml-parser:parser",
     "//platform/indexing-impl",
+    "//xml/xml-psi-api:psi",
     "//platform/core-ui",
   ],
   runtime_deps = [":html-tools_resources"]
@@ -53,6 +54,7 @@ jvm_library(
     "//platform/testFramework:testFramework_test_lib",
     "//spellchecker",
     "//spellchecker:spellchecker_test_lib",
+    "//xml/xml-psi-api:psi",
     "//xml/tests:tests_test_lib",
     "//platform/core-ui",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",

plugins/htmltools/intellij.html.tools.iml

@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
   <component name="copyright">

plugins/htmltools/intellij.html.tools.tests.iml

@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />

plugins/java-i18n/BUILD.bazel

@@ -39,6 +39,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/util/jdom",
+    "//xml/xml-psi-api:psi",
   ],
   exports = [
     "//plugins/properties:properties-backend",
@@ -86,6 +87,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/util/jdom",
+    "//xml/xml-psi-api:psi",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
   ],

plugins/java-i18n/intellij.java.i18n.iml

@@ -39,6 +39,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
   </component>
 </module>

plugins/javaFX/BUILD.bazel

@@ -42,6 +42,7 @@ jvm_library(
     "//platform/platform-util-io:ide-util-io",
     "//spellchecker",
     "//java/java-impl-refactorings:impl-refactorings",
+    "//xml/xml-psi-api:psi",
     "//platform/util/jdom",
   ],
   runtime_deps = [":javaFX_resources"]
@@ -90,6 +91,7 @@ jvm_library(
     "//spellchecker",
     "//spellchecker:spellchecker_test_lib",
     "//java/java-impl-refactorings:impl-refactorings",
+    "//xml/xml-psi-api:psi",
     "//platform/util/jdom",
   ],
   runtime_deps = [":javaFX_resources"]
@@ -117,6 +119,7 @@ jvm_library(
   srcs = glob(["properties/src/**/*.kt", "properties/src/**/*.java"], allow_empty = True),
   deps = [
     "//platform/platform-impl:ide-impl",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//plugins/properties/properties-psi-impl:backend-psi",
     "//plugins/javaFX",

plugins/javaFX/community/BUILD.bazel

@@ -39,6 +39,7 @@ jvm_library(
     "//java/compiler/openapi:java-compiler",
     "//platform/core-ui",
     "//plugins/javaFX:javaFX-properties",
+    "//xml/xml-psi-api:psi",
     "//java/java-impl-refactorings:impl-refactorings",
   ],
   runtime_deps = [":community_resources"]

plugins/javaFX/community/intellij.javaFX.community.iml

@@ -24,6 +24,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.javaFX.properties" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" scope="TEST" />
   </component>
 </module>

plugins/javaFX/intellij.javaFX.iml

@@ -41,6 +41,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
   </component>
 </module>

plugins/javaFX/intellij.javaFX.properties.iml

@@ -9,6 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.properties.backend.psi" />
     <orderEntry type="module" module-name="intellij.javaFX" />

plugins/kotlin/frontend-independent/BUILD.bazel

@@ -25,6 +25,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/refactoring",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/base/frontend-agnostic",
     "//plugins/kotlin/base/facet",
     "//plugins/kotlin/base/util",

plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml

@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
     <orderEntry type="module" module-name="kotlin.base.facet" />
     <orderEntry type="module" module-name="kotlin.base.util" />

plugins/kotlin/maven/BUILD.bazel

@@ -21,6 +21,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",
     "//platform/workspace/storage",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/base/frontend-agnostic",
     "//platform/observable",
     "//plugins/kotlin/base/util",

plugins/kotlin/maven/kotlin.maven.iml

@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="kotlin.base.util" />

plugins/kotlin/maven/tests/BUILD.bazel

@@ -24,6 +24,7 @@ jvm_library(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "@lib//:gson",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/plugin/k1",
     "//java/testFramework",
     "//plugins/kotlin/base/util",

plugins/kotlin/maven/tests/kotlin.maven.tests.iml

@@ -18,6 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.util" />

plugins/kotlin/navigation/tests/BUILD.bazel

@@ -15,6 +15,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//xml/xml-psi-api:psi",
     "//plugins/kotlin/plugin/k2",
     "@lib//:kotlin-stdlib",
     "//java/openapi:java",

plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml

@@ -26,6 +26,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java" scope="TEST" />

plugins/markdown/images/BUILD.bazel

@@ -17,6 +17,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-api:editor-ui",
     "//platform/refactoring",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//platform/core-ui",
     "//platform/platform-impl:ide-impl",

plugins/markdown/images/intellij.markdown.images.iml

@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />

plugins/markdown/model/BUILD.bazel

@@ -15,6 +15,7 @@ jvm_library(
   deps = [
     "//plugins/markdown/core:markdown",
     "//platform/editor-ui-api:editor-ui",
+    "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//platform/core-api:core",
     "//platform/core-impl",

plugins/markdown/model/intellij.markdown.model.iml

@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.markdown" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />

plugins/markdown/test/BUILD.bazel

@@ -34,6 +34,7 @@ jvm_library(
     "//platform/usageView",
     "//spellchecker",
     "//spellchecker:spellchecker_test_lib",
+    "//xml/xml-psi-api:psi",
     "//plugins/yaml",
     "//plugins/yaml:yaml_test_lib",
     "//xml/xml-psi-impl:psi-impl",

plugins/markdown/test/intellij.markdown.tests.iml

@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.yaml" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />

plugins/maven/BUILD.bazel

@@ -101,6 +101,7 @@ jvm_library(
     "//platform/eel-impl",
     "@lib//:opentelemetry",
     "//java/debugger/shared",
+    "//xml/xml-psi-api:psi",
     "//platform/xdebugger-impl:debugger-impl",
     ":java-guiForms-rt_provided",
     ":artifactResolver-m31_provided",

plugins/maven/intellij.maven.iml

@@ -122,6 +122,7 @@
     <orderEntry type="module" module-name="intellij.platform.eel.impl" />
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
   </component>
   <component name="copyright">

plugins/maven/src/test/BUILD.bazel

@@ -65,6 +65,7 @@ jvm_library(
     "@lib//:kotlin-reflect",
     "@lib//:kotlinx-serialization-core",
     "//platform/statistics/testFramework",
+    "//xml/xml-psi-api:psi",
     "//platform/xdebugger-api:debugger",
   ],
   runtime_deps = [":maven-tests_test_resources"]

plugins/maven/src/test/intellij.maven.tests.iml

@@ -49,6 +49,7 @@
     <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinx-serialization-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger" scope="TEST" />
   </component>
 </module>

plugins/maven/testFramework/BUILD.bazel

@@ -25,6 +25,7 @@ jvm_library(
     "//java/testFramework",
     "//platform/projectModel-api:projectModel",
     "//platform/core-api:core",
+    "//xml/xml-psi-api:psi",
     "//platform/backend/observation",
   ]
 )

plugins/maven/testFramework/intellij.maven.testFramework.iml

@@ -42,6 +42,7 @@
     <orderEntry type="module" module-name="intellij.java.testFramework" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.backend.observation" />
   </component>
 </module>

plugins/properties/tests/BUILD.bazel

@@ -40,6 +40,7 @@ jvm_library(
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
     "//platform/diff-impl",
+    "//xml/xml-psi-api:psi",
     "@lib//:fastutil-min",
   ]
 )

plugins/properties/tests/intellij.properties.tests.iml

@@ -31,6 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.structuralSearch.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
   </component>
 </module>

plugins/testng/BUILD.bazel

@@ -49,6 +49,7 @@ jvm_library(
     "//platform/platform-util-io:ide-util-io",
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/util/jdom",
+    "//xml/xml-psi-api:psi",
     "@lib//:jgoodies-forms",
   ],
   runtime_deps = [
@@ -96,6 +97,7 @@ jvm_library(
     "//platform/platform-util-io:ide-util-io",
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/util/jdom",
+    "//xml/xml-psi-api:psi",
     "@lib//:jgoodies-forms",
   ],
   runtime_deps = [

plugins/testng/intellij.testng.iml

@@ -39,6 +39,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
   </component>
   <component name="copyright">

plugins/ui-designer/BUILD.bazel

@@ -63,6 +63,7 @@ jvm_library(
     "//platform/platform-util-io:ide-util-io",
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/util/jdom",
+    "//xml/xml-psi-api:psi",
   ],
   exports = [
     "//java/compiler/forms-compiler:java-guiForms-compiler",
@@ -128,6 +129,7 @@ jvm_library(
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/util/jdom",
     "//jps/jps-builders:build-tests_test_lib",
+    "//xml/xml-psi-api:psi",
     "@lib//:caffeine",
   ],
   runtime_deps = [

plugins/ui-designer/intellij.java.guiForms.designer.iml

@@ -57,6 +57,7 @@
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="library" scope="TEST" name="caffeine" level="project" />
   </component>
   <component name="copyright">

plugins/xpath/BUILD.bazel

@@ -35,6 +35,7 @@ jvm_library(
     "//xml/impl",
     "//platform/editor-ui-ex:editor-ex",
     "//RegExpSupport:regexp",
+    "//xml/xml-psi-api:psi",
     "//plugins/xpath/xslt-rt:rt",
     "@lib//:jaxen",
     "//platform/util/nanoxml",
@@ -74,6 +75,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex",
     "//RegExpSupport:regexp",
     "//RegExpSupport:regexp_test_lib",
+    "//xml/xml-psi-api:psi",
     "//plugins/xpath/xslt-rt:rt",
     "@lib//:jaxen",
     "@lib//:junit4",

plugins/xpath/intellij.xpath.iml

@@ -28,6 +28,7 @@
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.regexp" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xpath.rt" />
     <orderEntry type="library" name="Jaxen" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />

plugins/xslt-debugger/BUILD.bazel

@@ -15,6 +15,7 @@ jvm_library(
   deps = [
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-api:editor-ui",
+    "//xml/xml-psi-api:psi",
     "//plugins/xpath",
     "//plugins/xslt-debugger/engine:xslt-debugger-rt",
     "//platform/lang-api:lang",

plugins/xslt-debugger/intellij.xslt.debugger.iml

@@ -13,6 +13,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xpath" />
     <orderEntry type="module" module-name="intellij.xslt.debugger.rt" />
     <orderEntry type="module" module-name="intellij.platform.lang" />

spellchecker/xml/BUILD.bazel

@@ -19,6 +19,7 @@ jvm_library(
     "//xml/impl",
     "//platform/util",
     "//platform/analysis-api:analysis",
+    "//xml/xml-psi-api:psi",
     "//platform/core-impl",
   ],
   runtime_deps = [":xml_resources"]