IDEA-385095 don't export java.psi/syntax and editor/util.ui

IJPL-237791 IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957

GitOrigin-RevId: 1add5a2036810e83f1d289b5b38b532960fe8da8

RegExpSupport/BUILD.bazel

@@ -29,6 +29,7 @@ jvm_library(
     "//platform/core-impl",
     "//libraries/fastutil",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//platform/core-ui",
     "//platform/util/jdom",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
@@ -58,6 +59,7 @@ jvm_library(
     "//platform/core-impl:core-impl_test_lib",
     "//libraries/fastutil:fastutil_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/core-ui:core-ui_test_lib",
     "//platform/util/jdom:jdom_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",

RegExpSupport/intellij.regexp.iml

@@ -25,6 +25,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />

aether-dependency-resolver/BUILD.bazel

@@ -28,6 +28,7 @@ jvm_library(
     "//libraries/plexus-utils",
     "//libraries/commons/codec",
     "//platform/util",
+    "//platform/util/base",
   ]
 )
 
@@ -48,6 +49,7 @@ jvm_library(
     "//libraries/plexus-utils:plexus-utils_test_lib",
     "//libraries/commons/codec:codec_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util/base:base_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.aetherDependencyResolver` end
@@ -97,6 +99,8 @@ jvm_library(
     "//libraries/commons/codec:codec_test_lib",
     "//platform/util",
     "//platform/util:util_test_lib",
+    "//platform/util/base",
+    "//platform/util/base:base_test_lib",
   ],
   runtime_deps = [":java-aetherDependencyResolver-tests"]
 )

aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml

@@ -110,5 +110,6 @@
     <orderEntry type="module" module-name="intellij.libraries.plexus.utils" />
     <orderEntry type="module" module-name="intellij.libraries.commons.codec" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
   </component>
 </module>

aether-dependency-resolver/intellij.java.aetherDependencyResolver.tests.iml

@@ -93,6 +93,7 @@
     <orderEntry type="module" module-name="intellij.libraries.plexus.utils" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.commons.codec" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" scope="TEST" />
   </component>
   <component name="TestModuleProperties" production-module="intellij.java.aetherDependencyResolver" />

build/BUILD.bazel

@@ -90,6 +90,7 @@ jvm_library(
     "//platform/build-scripts",
     "@lib//:kotlin-stdlib",
     "//platform/util",
+    "//platform/util/base",
     "//jps/model-api:model",
     "//build/deps:dependencies",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
@@ -118,6 +119,7 @@ jvm_library(
     ":build",
     "//platform/build-scripts:build-scripts_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util/base:base_test_lib",
     "//jps/model-api:model_test_lib",
     "//build/deps:dependencies_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",

build/intellij.idea.community.build.iml

@@ -25,6 +25,7 @@
     <orderEntry type="library" scope="RUNTIME" name="test-discovery-plugin-base" level="project" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.idea.community.build.dependencies" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />

build/launch/BUILD.bazel

@@ -18,6 +18,7 @@ jvm_library(
     "//libraries/kotlinx/coroutines/core",
     "//platform/runtime/product",
     "//platform/util",
+    "//platform/util/base",
     "//jps/model-api:model",
     "//jps/model-serialization",
     "//platform/build-scripts/downloader",
@@ -35,6 +36,7 @@ jvm_library(
     "//libraries/kotlinx/coroutines/core:core_test_lib",
     "//platform/runtime/product:product_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util/base:base_test_lib",
     "//jps/model-api:model_test_lib",
     "//jps/model-serialization:model-serialization_test_lib",
     "//platform/build-scripts/downloader:downloader_test_lib",

build/launch/intellij.idea.tools.launch.iml

@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
     <orderEntry type="module" module-name="intellij.platform.runtime.product" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.buildScripts.downloader" />

grid/api/BUILD.bazel

@@ -15,6 +15,7 @@ jvm_library(
   resources = [":grid_resources"],
   deps = [
     "//platform/util",
+    "//platform/util/base",
     "//platform/core-api:core",
   ]
 )
@@ -27,6 +28,7 @@ jvm_library(
   runtime_deps = [
     ":grid",
     "//platform/util:util_test_lib",
+    "//platform/util/base:base_test_lib",
     "//platform/core-api:core_test_lib",
   ]
 )

grid/api/intellij.grid.iml

@@ -9,6 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.core" />
   </component>
 </module>

grid/csv/BUILD.bazel

@@ -17,6 +17,7 @@ jvm_library(
     "@lib//:jetbrains-annotations",
     "//platform/util",
     "//platform/util/jdom",
+    "//platform/util/base",
     "//platform/core-api:core",
     "//grid/types",
     "//platform/core-impl",
@@ -35,6 +36,7 @@ jvm_library(
     ":csv-core-impl",
     "//platform/util:util_test_lib",
     "//platform/util/jdom:jdom_test_lib",
+    "//platform/util/base:base_test_lib",
     "//platform/core-api:core_test_lib",
     "//grid/types:types_test_lib",
     "//platform/core-impl:core-impl_test_lib",

grid/csv/intellij.grid.csv.core.impl.iml

@@ -11,6 +11,7 @@
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.grid.types" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />

grid/impl-ide/BUILD.bazel

@@ -23,6 +23,8 @@ jvm_library(
     "//platform/util",
     "//grid/core-impl",
     "//grid/impl",
+    "//platform/util:util-ui",
+    "//platform/editor-ui-api:editor-ui",
   ]
 )
 
@@ -41,6 +43,8 @@ jvm_library(
     "//platform/util:util_test_lib",
     "//grid/core-impl:core-impl_test_lib",
     "//grid/impl:impl_test_lib",
+    "//platform/util:util-ui_test_lib",
+    "//platform/editor-ui-api:editor-ui_test_lib",
   ]
 )
 ### auto-generated section `build intellij.grid.impl.ide` end

grid/impl-ide/intellij.grid.impl.ide.iml

@@ -17,5 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.grid.core.impl" />
     <orderEntry type="module" module-name="intellij.grid.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
   </component>
 </module>

grid/impl/BUILD.bazel

@@ -61,6 +61,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex",
     "//platform/core-impl",
     "//platform/ide-core/plugins",
+    "//platform/ide-core",
     "//platform/execution-impl",
     "//platform/platform-api:ide",
     "//platform/util/jdom",
@@ -72,6 +73,7 @@ jvm_library(
     "//platform/lang-api:lang",
     "//platform/forms_rt:java-guiForms-rt",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
+    "//platform/util:util-ui",
   ]
 )
 
@@ -112,6 +114,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex_test_lib",
     "//platform/core-impl:core-impl_test_lib",
     "//platform/ide-core/plugins:plugins_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/execution-impl:execution-impl_test_lib",
     "//platform/platform-api:ide_test_lib",
     "//platform/util/jdom:jdom_test_lib",
@@ -123,6 +126,7 @@ jvm_library(
     "//platform/lang-api:lang_test_lib",
     "//platform/forms_rt:java-guiForms-rt_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
+    "//platform/util:util-ui_test_lib",
   ]
 )
 ### auto-generated section `build intellij.grid.impl` end

grid/impl/intellij.grid.impl.iml

@@ -58,6 +58,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
@@ -69,5 +70,6 @@
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
   </component>
 </module>

images/BUILD.bazel

@@ -27,6 +27,7 @@ jvm_library(
     "//platform/forms_rt:java-guiForms-rt",
     "//platform/core-ui",
     "//platform/platform-util-io:ide-util-io",
+    "//platform/ide-core",
     "//platform/util/jdom",
     "//libraries/jcef",
     "//libraries/kotlinx/serialization/core",
@@ -66,6 +67,7 @@ jvm_library(
     "//platform/forms_rt:java-guiForms-rt_test_lib",
     "//platform/core-ui:core-ui_test_lib",
     "//platform/platform-util-io:ide-util-io_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/util/jdom:jdom_test_lib",
     "//libraries/jcef:jcef_test_lib",
     "//libraries/kotlinx/serialization/core:core_test_lib",

images/intellij.platform.images.iml

@@ -42,6 +42,7 @@
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <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.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.libraries.jcef" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />

java/codeserver/core/BUILD.bazel

@@ -17,8 +17,11 @@ jvm_library(
     "@lib//:jetbrains-annotations",
     "//libraries/stream",
     "//platform/core-api:core",
+    "//platform/core-impl",
     "//jps/model-api:model",
     "//platform/util",
+    "//platform/util/multiplatform",
+    "//platform/util/base",
     "//platform/projectModel-api:projectModel",
     "//platform/indexing-api:indexing",
     "//platform/workspace/jps",
@@ -26,6 +29,7 @@ jvm_library(
     "//java/java-frontback-psi-api:frontback-psi",
     "//java/java-psi-api:psi",
     "//java/java-psi-impl:psi-impl",
+    "//java/java-syntax:syntax",
     "//platform/workspace/storage",
     "//java/java-indexing-api:indexing",
   ],
@@ -41,8 +45,11 @@ jvm_library(
     ":core",
     "//libraries/stream:stream_test_lib",
     "//platform/core-api:core_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//jps/model-api:model_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util/multiplatform:multiplatform_test_lib",
+    "//platform/util/base:base_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/indexing-api:indexing_test_lib",
     "//platform/workspace/jps:jps_test_lib",
@@ -50,6 +57,7 @@ jvm_library(
     "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//java/java-psi-api:psi_test_lib",
     "//java/java-psi-impl:psi-impl_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//platform/workspace/storage:storage_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
     "//platform/backend:backend_test_lib",

java/codeserver/core/intellij.java.codeserver.core.iml

@@ -11,8 +11,11 @@
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.multiplatform" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
@@ -20,6 +23,7 @@
     <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />

java/codeserver/highlighting/BUILD.bazel

@@ -17,6 +17,7 @@ jvm_library(
     "@lib//:jetbrains-annotations",
     "//libraries/stream",
     "//platform/core-api:core",
+    "//platform/core-impl",
     "//jps/model-api:model",
     "//platform/util",
     "//platform/projectModel-api:projectModel",
@@ -24,6 +25,7 @@ jvm_library(
     "//java/java-frontback-psi-api:frontback-psi",
     "//java/java-psi-api:psi",
     "//java/java-psi-impl:psi-impl",
+    "//java/java-syntax:syntax",
     "//java/java-indexing-api:indexing",
     "//java/codeserver/core",
     "//java/java-frontback-impl:frontback-impl",
@@ -41,6 +43,7 @@ jvm_library(
     ":highlighting",
     "//libraries/stream:stream_test_lib",
     "//platform/core-api:core_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//jps/model-api:model_test_lib",
     "//platform/util:util_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
@@ -48,6 +51,7 @@ jvm_library(
     "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//java/java-psi-api:psi_test_lib",
     "//java/java-psi-impl:psi-impl_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
     "//java/codeserver/core:core_test_lib",
     "//java/java-frontback-impl:frontback-impl_test_lib",

java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml

@@ -11,6 +11,7 @@
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
@@ -18,6 +19,7 @@
     <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
     <orderEntry type="module" module-name="intellij.java.frontback.impl" />

java/compiler/BUILD.bazel

@@ -13,6 +13,7 @@ jvm_library(
     "//java/openapi:java",
     "//java/compiler/instrumentation-util",
     "//java/idea-ui:ui",
+    "//java/java-syntax:syntax",
     "//spellchecker",
     "//platform/core-ui",
     "//platform/workspace/jps",
@@ -38,6 +39,8 @@ jvm_library(
     "//java/compiler/instrumentation-util:instrumentation-util_test_lib",
     "//java/idea-ui:ui",
     "//java/idea-ui:ui_test_lib",
+    "//java/java-syntax:syntax",
+    "//java/java-syntax:syntax_test_lib",
     "//platform/analysis-api:analysis",
     "//platform/analysis-api:analysis_test_lib",
     "//platform/core-api:core",
@@ -48,6 +51,8 @@ jvm_library(
     "//jps/model-api:model_test_lib",
     "//platform/lang-core",
     "//platform/lang-core:lang-core_test_lib",
+    "//platform/lang-api:lang",
+    "//platform/lang-api:lang_test_lib",
     "//platform/projectModel-api:projectModel",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/workspace/storage",
@@ -63,10 +68,14 @@ jvm_library(
     "@community//build:build-javac-rt_test_lib",
     "//platform/core-ui",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/workspace/jps",
     "//platform/workspace/jps:jps_test_lib",
     "//platform/util/jdom",
     "//platform/util/jdom:jdom_test_lib",
+    "//platform/util:util-ui",
+    "//platform/util:util-ui_test_lib",
     "//libraries/kotlinx/coroutines/core",
     "//libraries/kotlinx/coroutines/core:core_test_lib",
     "//platform/backend/workspace",
@@ -80,10 +89,14 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//jps/jps-builders:build",
     "//jps/jps-builders:build_test_lib",
+    "//platform/ide-core",
+    "//platform/progress/shared:ide-progress",
   ],
   runtime_deps = [
     ":compiler-tests",
     "//spellchecker:spellchecker_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
+    "//platform/progress/shared:ide-progress_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.compiler.tests` end

java/compiler/forms-compiler/BUILD.bazel

@@ -85,6 +85,8 @@ jvm_library(
     "//java/compiler/instrumentation-util:instrumentation-util_test_lib",
     "//platform/util",
     "//platform/util:util_test_lib",
+    "//platform/util/multiplatform",
+    "//platform/util/multiplatform:multiplatform_test_lib",
     "@lib//:jetbrains-annotations",
     "@lib//:junit4",
   ],

java/compiler/forms-compiler/intellij.java.guiForms.compiler.tests.iml

@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.multiplatform" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jetbrains-annotations" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.java.guiForms.compiler" scope="TEST" />

java/compiler/impl/BUILD.bazel

@@ -31,9 +31,12 @@ jvm_library(
     "//platform/refactoring",
     "//platform/util/jdom",
     "//platform/util",
+    "//platform/util:util-ui",
+    "//platform/util-ex",
     "//java/openapi:java",
     "//platform/platform-impl:ide-impl",
     "//java/java-runtime:rt",
+    "//java/java-psi-api:psi",
     "//platform/ide-core/plugins",
     "//java/compiler/instrumentation-util",
     "//platform/vcs-api:vcs",
@@ -44,16 +47,21 @@ jvm_library(
     "@community//build:build-javac-rt",
     "//jps/jps-builders:build",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//jps/jps-launcher:build-launcher",
     "//jps/model-impl",
     "//java/java-analysis-impl:analysis-impl",
+    "//java/java-syntax:syntax",
     "//platform/built-in-server:builtInServer-impl",
+    "//platform/built-in-server-api:builtInServer",
     "//platform/vcs-impl",
     "//platform/external-system-api:externalSystem",
     "//platform/statistics",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//platform/workspace/jps",
     "//platform/platform-util-io-impl:ide-util-io-impl",
+    "//platform/platform-util-io:ide-util-io",
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/workspace/storage",
     "//platform/wsl-impl",
@@ -83,8 +91,11 @@ jvm_library(
     "@lib//:netty-codec-protobuf",
     "//platform/eel-provider",
     "//xml/xml-psi-api:psi",
+    "//xml/xml-parser:parser",
     "//platform/execution",
     "//platform/forms_rt:java-guiForms-rt",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//platform/lang-api:lang",
   ],
   exports = ["//java/compiler/openapi:java-compiler"]
 )
@@ -117,9 +128,12 @@ jvm_library(
     "//platform/refactoring:refactoring_test_lib",
     "//platform/util/jdom:jdom_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util:util-ui_test_lib",
+    "//platform/util-ex:util-ex_test_lib",
     "//java/openapi:java_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
     "//java/java-runtime:rt_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//platform/ide-core/plugins:plugins_test_lib",
     "//java/compiler/instrumentation-util:instrumentation-util_test_lib",
     "//platform/vcs-api:vcs_test_lib",
@@ -130,16 +144,21 @@ jvm_library(
     "@community//build:build-javac-rt_test_lib",
     "//jps/jps-builders:build_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//jps/jps-launcher:build-launcher_test_lib",
     "//jps/model-impl:model-impl_test_lib",
     "//java/java-analysis-impl:analysis-impl_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//platform/built-in-server:builtInServer-impl_test_lib",
+    "//platform/built-in-server-api:builtInServer_test_lib",
     "//platform/vcs-impl:vcs-impl_test_lib",
     "//platform/external-system-api:externalSystem_test_lib",
     "//platform/statistics:statistics_test_lib",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/workspace/jps:jps_test_lib",
     "//platform/platform-util-io-impl:ide-util-io-impl_test_lib",
+    "//platform/platform-util-io:ide-util-io_test_lib",
     "//platform/platform-util-netty:ide-util-netty_test_lib",
     "//platform/workspace/storage:storage_test_lib",
     "//platform/wsl-impl:wsl-impl_test_lib",
@@ -164,8 +183,11 @@ jvm_library(
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
     "//platform/eel-provider:eel-provider_test_lib",
     "//xml/xml-psi-api:psi_test_lib",
+    "//xml/xml-parser:parser_test_lib",
     "//platform/execution:execution_test_lib",
     "//platform/forms_rt:java-guiForms-rt_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
+    "//platform/lang-api:lang_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.compiler.impl` end

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

@@ -25,9 +25,12 @@
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
     <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
@@ -38,16 +41,21 @@
     <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.launcher" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
     <orderEntry type="module" module-name="intellij.java.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.platform.wsl.impl" />
@@ -77,8 +85,11 @@
     <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.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
   <component name="copyright">
     <Base>

java/compiler/intellij.java.compiler.tests.iml

@@ -14,11 +14,13 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
     <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
@@ -28,8 +30,10 @@
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jetCheck" level="project" />
@@ -37,6 +41,8 @@
     <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.progress" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>

java/compiler/openapi/BUILD.bazel

@@ -29,6 +29,10 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/workspace/jps",
     "//platform/execution",
+    "//platform/ide-core",
+    "//platform/platform-api:ide",
+    "//platform/lang-api:lang",
+    "//java/java-psi-api:psi",
   ],
   exports = ["//platform/workspace/jps"]
 )
@@ -58,6 +62,10 @@ jvm_library(
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/workspace/jps:jps_test_lib",
     "//platform/execution:execution_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
+    "//platform/platform-api:ide_test_lib",
+    "//platform/lang-api:lang_test_lib",
+    "//java/java-psi-api:psi_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.compiler` end

java/compiler/openapi/intellij.java.compiler.iml

@@ -23,6 +23,10 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" exported="" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
   </component>
   <component name="copyright">
     <Base>

java/debugger/impl/BUILD.bazel

@@ -23,6 +23,8 @@ jvm_library(
     "//java/debugger/openapi:java-debugger",
     "//java/openapi:java",
     "//java/execution/openapi:java-execution",
+    "//java/java-syntax:syntax",
+    "//java/java-psi-api:psi",
     "//java/java-indexing-api:indexing",
     "//platform/analysis-api:analysis",
     "//platform/util/concurrency",
@@ -38,6 +40,7 @@ jvm_library(
     "//platform/forms_rt:java-guiForms-rt",
     "//java/java-runtime:rt",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/jsp-openapi:jsp",
     "//java/java-impl:impl",
     "//java/java-impl-refactorings:impl-refactorings",
@@ -52,8 +55,11 @@ jvm_library(
     "//libraries/stream",
     "//platform/statistics",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//libraries/fastutil",
     "//platform/platform-util-io-impl:ide-util-io-impl",
+    "//platform/platform-util-io:ide-util-io",
+    "//platform/progress/shared:ide-progress",
     "//libraries/gson",
     "//libraries/asm",
     "//platform/util/jdom",
@@ -64,10 +70,13 @@ jvm_library(
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
     "//platform/util/coroutines",
+    "//platform/util:util-ui",
+    "//platform/util-ex",
     "//platform/threadDumpParser",
     "//java/debugger/shared",
     "//platform/eel-provider",
     "//java/codeserver/highlighting",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//xml/xml-psi-api:psi",
     "//platform/xdebugger-impl/shared",
     "//platform/xdebugger-impl/rpc",
@@ -93,6 +102,10 @@ jvm_library(
     "//java/openapi:java_test_lib",
     "//java/execution/openapi:java-execution",
     "//java/execution/openapi:java-execution_test_lib",
+    "//java/java-syntax:syntax",
+    "//java/java-syntax:syntax_test_lib",
+    "//java/java-psi-api:psi",
+    "//java/java-psi-api:psi_test_lib",
     "//java/java-indexing-api:indexing",
     "//java/java-indexing-api:indexing_test_lib",
     "//platform/analysis-api:analysis",
@@ -122,6 +135,7 @@ jvm_library(
     "//java/java-runtime:rt",
     "//java/java-runtime:rt_test_lib",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/jsp-openapi:jsp",
     "//java/jsp-openapi:jsp_test_lib",
     "//java/java-impl:impl",
@@ -147,9 +161,13 @@ jvm_library(
     "//platform/statistics:statistics_test_lib",
     "//platform/core-ui",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl",
+    "//platform/core-impl:core-impl_test_lib",
     "//libraries/fastutil",
     "//libraries/fastutil:fastutil_test_lib",
     "//platform/platform-util-io-impl:ide-util-io-impl",
+    "//platform/platform-util-io:ide-util-io",
+    "//platform/progress/shared:ide-progress",
     "//libraries/gson",
     "//libraries/gson:gson_test_lib",
     "//libraries/asm",
@@ -170,6 +188,10 @@ jvm_library(
     "//libraries/kotlinx/serialization/json:json_test_lib",
     "//platform/util/coroutines",
     "//platform/util/coroutines:coroutines_test_lib",
+    "//platform/util:util-ui",
+    "//platform/util:util-ui_test_lib",
+    "//platform/util-ex",
+    "//platform/util-ex:util-ex_test_lib",
     "//platform/threadDumpParser",
     "//platform/threadDumpParser:threadDumpParser_test_lib",
     "//java/debugger/shared",
@@ -178,6 +200,8 @@ jvm_library(
     "//platform/eel-provider:eel-provider_test_lib",
     "//java/codeserver/highlighting",
     "//java/codeserver/highlighting:highlighting_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//xml/xml-psi-api:psi",
     "//xml/xml-psi-api:psi_test_lib",
     "//platform/xdebugger-impl/shared",
@@ -201,8 +225,11 @@ jvm_library(
   ],
   runtime_deps = [
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
     "//platform/platform-util-io-impl:ide-util-io-impl_test_lib",
+    "//platform/platform-util-io:ide-util-io_test_lib",
+    "//platform/progress/shared:ide-progress_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.debugger.impl` end

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

@@ -34,6 +34,8 @@
     <orderEntry type="module" module-name="intellij.java.debugger" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
@@ -49,6 +51,7 @@
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <orderEntry type="module" module-name="intellij.java.rt" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.jsp" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
@@ -80,8 +83,11 @@
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
+    <orderEntry type="module" module-name="intellij.platform.ide.progress" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
@@ -92,10 +98,13 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.threadDumpParser" />
     <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.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.shared" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.rpc" />

java/debugger/openapi/BUILD.bazel

@@ -15,8 +15,10 @@ jvm_library(
   resources = [":java-debugger_resources"],
   deps = [
     "//java/execution/openapi:java-execution",
+    "//java/java-syntax:syntax",
     "//java/jsp-openapi:jsp",
     "//java/java-psi-api:psi",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
@@ -46,8 +48,10 @@ jvm_library(
   runtime_deps = [
     ":java-debugger",
     "//java/execution/openapi:java-execution_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//java/jsp-openapi:jsp_test_lib",
     "//java/java-psi-api:psi_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/analysis-api:analysis_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",

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

@@ -9,8 +9,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.jsp" />
     <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />

java/debugger/shared/BUILD.bazel

@@ -29,10 +29,12 @@ jvm_library(
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
     "//platform/platform-impl/rpc",
+    "//platform/ide-core",
     "//platform/execution",
     "//platform/execution-impl",
     "//java/java-frontback-impl:frontback-impl",
     "//platform/util/coroutines",
+    "//platform/util:util-ui",
     "//platform/xdebugger-impl/rpc",
     "//platform/xdebugger-impl/shared",
     "//platform/xdebugger-impl/ui",
@@ -61,10 +63,12 @@ jvm_library(
     "//libraries/kotlinx/serialization/core:core_test_lib",
     "//libraries/kotlinx/serialization/json:json_test_lib",
     "//platform/platform-impl/rpc:rpc_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/execution:execution_test_lib",
     "//platform/execution-impl:execution-impl_test_lib",
     "//java/java-frontback-impl:frontback-impl_test_lib",
     "//platform/util/coroutines:coroutines_test_lib",
+    "//platform/util:util-ui_test_lib",
     "//platform/xdebugger-impl/rpc:rpc_test_lib",
     "//platform/xdebugger-impl/shared:shared_test_lib",
     "//platform/xdebugger-impl/ui:ui_test_lib",

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

@@ -48,10 +48,12 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
     <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.java.frontback.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.rpc" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.shared" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.ui" />

java/execution/backend/BUILD.bazel

@@ -31,6 +31,7 @@ jvm_library(
     "//platform/smRunner",
     "//platform/core-ui",
     "//platform/execution",
+    "//platform/testRunner",
   ],
   runtime_deps = ["//platform/backend"]
 )
@@ -60,6 +61,7 @@ jvm_library(
     "//platform/smRunner:smRunner_test_lib",
     "//platform/core-ui:core-ui_test_lib",
     "//platform/execution:execution_test_lib",
+    "//platform/testRunner:testRunner_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.execution.impl.backend` end

java/execution/backend/intellij.java.execution.impl.backend.iml

@@ -51,5 +51,6 @@
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" />
   </component>
 </module>

java/execution/frontend/BUILD.bazel

@@ -22,9 +22,11 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl/rpc",
     "//platform/platform-impl:ide-impl",
+    "//platform/ide-core",
     "//platform/kernel/shared:kernel",
     "//platform/project/shared:project",
     "//platform/testRunner",
+    "//platform/util:util-ui",
     "//java/java-frontback-impl:frontback-impl",
   ]
 )
@@ -44,9 +46,11 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/platform-impl/rpc:rpc_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/kernel/shared:kernel_test_lib",
     "//platform/project/shared:project_test_lib",
     "//platform/testRunner:testRunner_test_lib",
+    "//platform/util:util-ui_test_lib",
     "//java/java-frontback-impl:frontback-impl_test_lib",
   ]
 )

java/execution/frontend/intellij.java.execution.impl.frontend.iml

@@ -41,9 +41,11 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.kernel" />
     <orderEntry type="module" module-name="intellij.platform.project" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.java.frontback.impl" />
   </component>
 </module>

java/execution/impl/BUILD.bazel

@@ -16,26 +16,31 @@ jvm_library(
   deps = [
     "//java/openapi:java",
     "//platform/analysis-api:analysis",
+    "//java/java-psi-api:psi",
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/execution-impl",
     "//platform/platform-impl:ide-impl",
+    "//platform/lang-api:lang",
     "//java/execution/openapi:java-execution",
     "//java/java-runtime:rt",
     "//java/debugger/impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
     "//platform/testRunner",
     "//platform/vcs-api:vcs",
     "//platform/usageView",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/compiler/openapi:java-compiler",
     "//java/debugger/openapi:java-debugger",
     "//java/java-impl:impl",
     "//java/java-indexing-api:indexing",
+    "//java/java-syntax:syntax",
     "//platform/smRunner",
     "@lib//:intellij-test-discovery",
     "//platform/external-system-api:externalSystem",
@@ -53,8 +58,12 @@ jvm_library(
     "//platform/util-class-loader:util-classLoader",
     "//platform/diff-api:diff",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//platform/platform-util-io-impl:ide-util-io-impl",
+    "//platform/platform-util-io:ide-util-io",
     "//platform/util/jdom",
+    "//platform/util:util-ui",
+    "//platform/util-ex",
     "//platform/threadDumpParser",
     "//platform/eel-provider",
     "//java/debugger/shared",
@@ -62,13 +71,10 @@ jvm_library(
     "//java/codeserver/core",
     "//platform/execution",
     "//platform/forms_rt:java-guiForms-rt",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
   ],
-  exports = [
-    "//java/execution/openapi:java-execution",
-    "//platform/testRunner",
-    "//platform/statistics",
-  ]
+  exports = ["//java/execution/openapi:java-execution"]
 )
 
 jvm_library(
@@ -79,35 +85,36 @@ jvm_library(
   exports = [
     "//java/execution/openapi:java-execution",
     "//java/execution/openapi:java-execution_test_lib",
-    "//platform/testRunner",
-    "//platform/testRunner:testRunner_test_lib",
-    "//platform/statistics",
-    "//platform/statistics:statistics_test_lib",
   ],
   runtime_deps = [
     ":impl",
     "//java/openapi:java_test_lib",
     "//platform/analysis-api:analysis_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/execution-impl:execution-impl_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
+    "//platform/lang-api:lang_test_lib",
     "//java/execution/openapi:java-execution_test_lib",
     "//java/java-runtime:rt_test_lib",
     "//java/debugger/impl:impl_test_lib",
     "//platform/indexing-api:indexing_test_lib",
     "//jps/model-api:model_test_lib",
+    "//jps/model-serialization:model-serialization_test_lib",
     "//platform/lang-core:lang-core_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/testRunner:testRunner_test_lib",
     "//platform/vcs-api:vcs_test_lib",
     "//platform/usageView:usageView_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//java/compiler/openapi:java-compiler_test_lib",
     "//java/debugger/openapi:java-debugger_test_lib",
     "//java/java-impl:impl_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//platform/smRunner:smRunner_test_lib",
     "//platform/external-system-api:externalSystem_test_lib",
     "//platform/external-system-impl:externalSystem-impl_test_lib",
@@ -124,8 +131,12 @@ jvm_library(
     "//platform/util-class-loader:util-classLoader_test_lib",
     "//platform/diff-api:diff_test_lib",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/platform-util-io-impl:ide-util-io-impl_test_lib",
+    "//platform/platform-util-io:ide-util-io_test_lib",
     "//platform/util/jdom:jdom_test_lib",
+    "//platform/util:util-ui_test_lib",
+    "//platform/util-ex:util-ex_test_lib",
     "//platform/threadDumpParser:threadDumpParser_test_lib",
     "//platform/eel-provider:eel-provider_test_lib",
     "//java/debugger/shared:shared_test_lib",
@@ -133,6 +144,7 @@ jvm_library(
     "//java/codeserver/core:core_test_lib",
     "//platform/execution:execution_test_lib",
     "//platform/forms_rt:java-guiForms-rt_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
   ]
 )

java/execution/impl/intellij.java.execution.impl.iml

@@ -10,26 +10,31 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.java.execution" exported="" />
     <orderEntry type="module" module-name="intellij.java.rt" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.java.debugger" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
     <orderEntry type="library" name="intellij-test-discovery" level="project" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
@@ -43,12 +48,16 @@
     <orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
-    <orderEntry type="module" module-name="intellij.platform.statistics" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
+    <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.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.threadDumpParser" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" />
@@ -56,6 +65,7 @@
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
   </component>
   <component name="copyright">

java/execution/openapi/BUILD.bazel

@@ -15,6 +15,8 @@ jvm_library(
   resources = [":java-execution_resources"],
   deps = [
     "//java/openapi:java",
+    "//java/java-syntax:syntax",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//java/java-indexing-api:indexing",
     "@lib//:kotlin-stdlib",
     "//platform/analysis-api:analysis",
@@ -29,6 +31,10 @@ jvm_library(
     "//platform/core-ui",
     "//platform/platform-util-io:ide-util-io",
     "//platform/execution",
+    "//platform/platform-api:ide",
+    "//platform/ide-core",
+    "//platform/lang-api:lang",
+    "//java/java-psi-api:psi",
   ],
   runtime_deps = ["//platform/backend"]
 )
@@ -42,6 +48,8 @@ jvm_library(
     ":java-execution",
     "//platform/backend:backend_test_lib",
     "//java/openapi:java_test_lib",
+    "//java/java-syntax:syntax_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
     "//platform/analysis-api:analysis_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
@@ -55,6 +63,10 @@ jvm_library(
     "//platform/core-ui:core-ui_test_lib",
     "//platform/platform-util-io:ide-util-io_test_lib",
     "//platform/execution:execution_test_lib",
+    "//platform/platform-api:ide_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
+    "//platform/lang-api:lang_test_lib",
+    "//java/java-psi-api:psi_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.execution` end

java/execution/openapi/intellij.java.execution.iml

@@ -10,6 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
@@ -24,6 +26,10 @@
     <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.platform.execution" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
   </component>
   <component name="copyright">
     <Base>

java/ide-customization/BUILD.bazel

@@ -15,6 +15,7 @@ jvm_library(
   resources = [":ide-customization_resources"],
   deps = [
     "//java/java-psi-api:psi",
+    "//java/java-frontback-psi-api:frontback-psi",
     "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/lang-api:lang",
@@ -41,6 +42,7 @@ jvm_library(
   runtime_deps = [
     ":ide-customization",
     "//java/java-psi-api:psi_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/lang-api:lang_test_lib",
     "//platform/lang-impl:lang-impl_test_lib",
@@ -102,6 +104,7 @@ jvm_library(
     "//platform/lang-api:lang",
     "//platform/lang-api:lang_test_lib",
     "//platform/platform-impl:ide-impl",
+    "//platform/ide-core",
     "//platform/lang-core",
     "//platform/lang-core:lang-core_test_lib",
     "@lib//:junit5",
@@ -122,6 +125,7 @@ jvm_library(
     "//platform/testRunner:testRunner_test_lib",
     "//notebooks/visualization:visualization_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.ide.customization.tests` end

java/ide-customization/intellij.java.ide.customization.iml

@@ -9,6 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.lang" />

java/ide-customization/intellij.java.ide.customization.tests.iml

@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.testRunner" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.notebooks.visualization" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />

java/idea-ui/BUILD.bazel

@@ -17,12 +17,14 @@ jvm_library(
     "//java/openapi:java",
     "//java/compiler/openapi:java-compiler",
     "//java/compiler/impl",
+    "//java/java-psi-api:psi",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
     "//java/java-impl:impl",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//platform/execution",
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/indexing-api:indexing",
@@ -47,15 +49,18 @@ jvm_library(
     "//platform/statistics",
     "//libraries/fastutil",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//platform/lang-impl",
     "//platform/workspace/jps",
     "//platform/platform-util-io:ide-util-io",
+    "//platform/progress/shared:ide-progress",
     "//platform/feedback",
     "//platform/util/jdom",
     "//platform/backend/workspace",
     "//platform/workspace/storage",
     "//xml/dom-openapi:dom",
     "//platform/util/coroutines",
+    "//platform/util:util-ui",
     "//platform/backend/observation",
     "//platform/eel-provider",
     "//platform/util/concurrency",
@@ -67,8 +72,10 @@ jvm_library(
     "//libraries/jackson/jackson",
     "//libraries/jackson/databind",
     "//platform/forms_rt:java-guiForms-rt",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
     "//jps/jps-builders:build",
+    "//platform/lang-api:lang",
   ]
 )
 
@@ -82,12 +89,14 @@ jvm_library(
     "//java/openapi:java_test_lib",
     "//java/compiler/openapi:java-compiler_test_lib",
     "//java/compiler/impl:impl_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//platform/analysis-api:analysis_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
     "//java/java-impl:impl_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/execution:execution_test_lib",
     "//java/java-impl-refactorings:impl-refactorings_test_lib",
     "//platform/indexing-api:indexing_test_lib",
@@ -111,15 +120,18 @@ jvm_library(
     "//platform/statistics:statistics_test_lib",
     "//libraries/fastutil:fastutil_test_lib",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/lang-impl:lang-impl_test_lib",
     "//platform/workspace/jps:jps_test_lib",
     "//platform/platform-util-io:ide-util-io_test_lib",
+    "//platform/progress/shared:ide-progress_test_lib",
     "//platform/feedback:feedback_test_lib",
     "//platform/util/jdom:jdom_test_lib",
     "//platform/backend/workspace:workspace_test_lib",
     "//platform/workspace/storage:storage_test_lib",
     "//xml/dom-openapi:dom_test_lib",
     "//platform/util/coroutines:coroutines_test_lib",
+    "//platform/util:util-ui_test_lib",
     "//platform/backend/observation:observation_test_lib",
     "//platform/eel-provider:eel-provider_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
@@ -130,8 +142,10 @@ jvm_library(
     "//libraries/jackson/jackson:jackson_test_lib",
     "//libraries/jackson/databind:databind_test_lib",
     "//platform/forms_rt:java-guiForms-rt_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
     "//jps/jps-builders:build_test_lib",
+    "//platform/lang-api:lang_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.ui` end
@@ -188,17 +202,26 @@ jvm_library(
     "//jps/model-serialization:model-serialization_test_lib",
     "//platform/lang-core",
     "//platform/lang-core:lang-core_test_lib",
+    "//platform/lang-api:lang",
+    "//platform/lang-api:lang_test_lib",
     "//platform/projectModel-api:projectModel",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/platform-tests:tests",
     "//platform/platform-tests:tests_test_lib",
     "//platform/core-ui",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl",
+    "//platform/core-impl:core-impl_test_lib",
     "//java/compiler/openapi:java-compiler",
     "//java/compiler/openapi:java-compiler_test_lib",
     "//java/openapi:java",
     "//java/openapi:java_test_lib",
+    "//java/java-syntax:syntax",
+    "//java/java-syntax:syntax_test_lib",
+    "//java/java-psi-api:psi",
+    "//java/java-psi-api:psi_test_lib",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//platform/util/jdom",
     "//platform/util/jdom:jdom_test_lib",
     "//libraries/kotlinx/coroutines/core",
@@ -214,6 +237,10 @@ jvm_library(
     "@lib//:kotlin-test",
     "//platform/util",
     "//platform/util:util_test_lib",
+    "//platform/util:util-ui",
+    "//platform/util:util-ui_test_lib",
+    "//platform/util-ex",
+    "//platform/util-ex:util-ex_test_lib",
     "@lib//:ktor-server-cio",
     "//platform/testFramework/junit5/eel",
     "//platform/testFramework/junit5/eel:eel_test_lib",
@@ -231,10 +258,13 @@ jvm_library(
     "//platform/execution:execution_test_lib",
     "//platform/forms_rt:java-guiForms-rt",
     "//platform/forms_rt:java-guiForms-rt_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
   ],
   runtime_deps = [
     ":ui-tests",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.ui.tests` end

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

@@ -12,12 +12,14 @@
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
@@ -42,15 +44,18 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
+    <orderEntry type="module" module-name="intellij.platform.ide.progress" />
     <orderEntry type="module" module-name="intellij.platform.feedback" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.xml.dom" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <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" />
@@ -62,7 +67,9 @@
     <orderEntry type="module" module-name="intellij.libraries.jackson" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
 </module>

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

@@ -20,12 +20,17 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.compiler" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.syntax" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
@@ -34,6 +39,8 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="library" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="ktor-server-cio" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5.eel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
@@ -43,5 +50,6 @@
     <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" scope="TEST" />
   </component>
 </module>

java/java-analysis-api/BUILD.bazel

@@ -23,6 +23,8 @@ jvm_library(
   deps = [
     "//platform/analysis-api:analysis",
     "//java/java-psi-api:psi",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-syntax:syntax",
     "//platform/core-api:core",
     "//jps/model-api:model",
     "//platform/projectModel-api:projectModel",
@@ -34,10 +36,7 @@ jvm_library(
     "//platform/workspace/storage",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
   ],
-  exports = [
-    "//uast/uast-common:uast",
-    "//uast/uast-common-ide:ide",
-  ]
+  exports = ["//uast/uast-common:uast"]
 )
 
 jvm_library(
@@ -49,13 +48,13 @@ jvm_library(
   exports = [
     "//uast/uast-common:uast",
     "//uast/uast-common:uast_test_lib",
-    "//uast/uast-common-ide:ide",
-    "//uast/uast-common-ide:ide_test_lib",
   ],
   runtime_deps = [
     ":analysis",
     "//platform/analysis-api:analysis_test_lib",
     "//java/java-psi-api:psi_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//platform/core-api:core_test_lib",
     "//jps/model-api:model_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",

java/java-analysis-api/intellij.java.analysis.iml

@@ -26,13 +26,15 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.uast" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.uast.ide" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.uast.ide" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />

java/java-analysis-impl/BUILD.bazel

@@ -25,19 +25,24 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/analysis-impl",
     "//java/java-indexing-impl:indexing-impl",
+    "//java/java-psi-api:psi",
     "//java/java-psi-impl:psi-impl",
     "//platform/code-style-api:codeStyle",
     "//platform/util/concurrency",
+    "//uast/uast-common-ide:ide",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/projectModel-impl",
     "//java/java-analysis-api:analysis",
+    "//java/java-syntax:syntax",
     "//xml/xml-psi-api:psi",
     "//xml/xml-psi-impl:psi-impl",
     "//platform/platform-api:ide",
+    "//platform/ide-core",
     "//libraries/asm",
     "//libraries/stream",
     "@lib//:kotlin-stdlib",
@@ -50,6 +55,7 @@ jvm_library(
     "//platform/workspace/jps",
     "//platform/backend/workspace",
     "//java/java-frontback-impl:frontback-impl",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/editor-ui-ex:editor-ex",
     "//java/codeserver/highlighting",
     "//java/codeserver/core",
@@ -58,6 +64,8 @@ jvm_library(
     "//libraries/jsoup",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
     "//platform/core-ui",
+    "//platform/core-impl",
+    "//platform/lang-api:lang",
   ],
   exports = [
     "//platform/analysis-impl",
@@ -95,19 +103,24 @@ jvm_library(
     "//platform/analysis-api:analysis_test_lib",
     "//platform/analysis-impl:analysis-impl_test_lib",
     "//java/java-indexing-impl:indexing-impl_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//java/java-psi-impl:psi-impl_test_lib",
     "//platform/code-style-api:codeStyle_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
+    "//uast/uast-common-ide:ide_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/indexing-api:indexing_test_lib",
     "//jps/model-api:model_test_lib",
+    "//jps/model-serialization:model-serialization_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/projectModel-impl:projectModel-impl_test_lib",
     "//java/java-analysis-api:analysis_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//xml/xml-psi-api:psi_test_lib",
     "//xml/xml-psi-impl:psi-impl_test_lib",
     "//platform/platform-api:ide_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//libraries/asm:asm_test_lib",
     "//libraries/stream:stream_test_lib",
     "//java/openapi:java_test_lib",
@@ -119,6 +132,7 @@ jvm_library(
     "//platform/workspace/jps:jps_test_lib",
     "//platform/backend/workspace:workspace_test_lib",
     "//java/java-frontback-impl:frontback-impl_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/editor-ui-ex:editor-ex_test_lib",
     "//java/codeserver/highlighting:highlighting_test_lib",
     "//java/codeserver/core:core_test_lib",
@@ -127,6 +141,8 @@ jvm_library(
     "//libraries/jsoup:jsoup_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
+    "//platform/lang-api:lang_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.analysis.impl` end

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

@@ -28,19 +28,24 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
     <orderEntry type="module" module-name="intellij.java.indexing.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.platform.uast.ide" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <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.syntax" />
     <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="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
@@ -53,6 +58,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.java.frontback.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.java.codeserver.highlighting" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
@@ -61,5 +67,7 @@
     <orderEntry type="module" module-name="intellij.libraries.jsoup" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
 </module>

java/java-backend/BUILD.bazel

@@ -14,10 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":backend_resources"],
   exports = [
-    "//java/java-syntax:syntax",
-    "//java/java-frontback-psi-api:frontback-psi",
     "//java/java-frontback-psi-impl:frontback-psi-impl",
-    "//java/java-psi-api:psi",
     "//java/java-psi-impl:psi-impl",
     "//java/java-frontback-impl:frontback-impl",
     "//java/java-indexing-api:indexing",

java/java-backend/intellij.java.backend.iml

@@ -8,10 +8,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.java.syntax" exported="" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.syntax" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" exported="" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.java.psi" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.psi" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.frontback.impl" exported="" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.indexing" exported="" scope="RUNTIME" />

java/java-copyright/BUILD.bazel

@@ -18,6 +18,7 @@ jvm_library(
     "//plugins/copyright",
     "//platform/core-api:core",
     "//java/java-psi-api:psi",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/util",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
   ]
@@ -33,6 +34,7 @@ jvm_library(
     "//plugins/copyright:copyright_test_lib",
     "//platform/core-api:core_test_lib",
     "//java/java-psi-api:psi_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/util:util_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
   ]

java/java-copyright/intellij.java.copyright.iml

@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.copyright" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
   </component>

java/java-features-trainer/BUILD.bazel

@@ -16,18 +16,22 @@ jvm_library(
   deps = [
     "@lib//:kotlin-stdlib",
     "//java/openapi:java",
+    "//java/java-syntax:syntax",
     "//java/debugger/openapi:java-debugger",
+    "//java/java-psi-api:psi",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/execution-impl",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/java-impl:impl",
     "//java/idea-ui:ui",
     "//plugins/ide-features-trainer:featuresTrainer",
     "//platform/platform-impl:ide-impl",
     "//platform/xdebugger-api:debugger",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//java/debugger/impl",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
@@ -37,7 +41,10 @@ jvm_library(
     "//platform/refactoring",
     "//java/execution/impl",
     "//java/debugger/shared",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/execution",
+    "//platform/lang-api:lang",
+    "//platform/util:util-ui",
   ]
 )
 
@@ -49,18 +56,22 @@ jvm_library(
   runtime_deps = [
     ":featuresTrainer",
     "//java/openapi:java_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//java/debugger/openapi:java-debugger_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//platform/analysis-api:analysis_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/execution-impl:execution-impl_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//java/java-impl:impl_test_lib",
     "//java/idea-ui:ui_test_lib",
     "//plugins/ide-features-trainer:featuresTrainer_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
     "//platform/xdebugger-api:debugger_test_lib",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//java/debugger/impl:impl_test_lib",
     "//libraries/kotlinx/serialization/core:core_test_lib",
     "//libraries/kotlinx/serialization/json:json_test_lib",
@@ -72,7 +83,10 @@ jvm_library(
     "//platform/testFramework:testFramework_test_lib",
     "//java/execution/impl:impl_test_lib",
     "//java/debugger/shared:shared_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/execution:execution_test_lib",
+    "//platform/lang-api:lang_test_lib",
+    "//platform/util:util-ui_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.featuresTrainer` end

java/java-features-trainer/intellij.java.featuresTrainer.iml

@@ -11,18 +11,22 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.java.debugger" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="module" module-name="intellij.featuresTrainer" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
@@ -33,6 +37,9 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.execution.impl" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
   </component>
 </module>

java/java-frontback-impl/BUILD.bazel

@@ -21,17 +21,22 @@ jvm_library(
     "//platform/core-impl",
     "//platform/editor-ui-api:editor-ui",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//platform/lang-impl",
     "//platform/platform-impl:ide-impl",
     "//platform/analysis-impl",
     "//platform/core-ui",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
+    "//platform/util:util-ui",
     "//xml/xml-parser:parser",
     "//platform/core-api:core",
     "//platform/util/jdom",
     "//platform/syntax/syntax-psi:psi",
+    "//platform/syntax/syntax-util:util",
+    "//java/java-psi-api:psi",
     "//java/java-psi-impl:psi-impl",
+    "//java/java-syntax:syntax",
     "//platform/statistics",
     "//platform/threadDumpParser",
     "//platform/code-style-impl:codeStyle-impl",
@@ -42,12 +47,7 @@ jvm_library(
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
     "//platform/util/concurrency",
   ],
-  exports = [
-    "//java/java-frontback-psi-api:frontback-psi",
-    "//java/java-frontback-psi-impl:frontback-psi-impl",
-    "//platform/core-impl",
-    "//xml/xml-parser:parser",
-  ]
+  exports = ["//java/java-frontback-psi-impl:frontback-psi-impl"]
 )
 
 jvm_library(
@@ -56,14 +56,8 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   exports = [
-    "//java/java-frontback-psi-api:frontback-psi",
-    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//java/java-frontback-psi-impl:frontback-psi-impl",
     "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib",
-    "//platform/core-impl",
-    "//platform/core-impl:core-impl_test_lib",
-    "//xml/xml-parser:parser",
-    "//xml/xml-parser:parser_test_lib",
   ],
   runtime_deps = [
     ":frontback-impl",
@@ -74,17 +68,22 @@ jvm_library(
     "//platform/core-impl:core-impl_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/lang-impl:lang-impl_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
     "//platform/analysis-impl:analysis-impl_test_lib",
     "//platform/core-ui:core-ui_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/refactoring:refactoring_test_lib",
+    "//platform/util:util-ui_test_lib",
     "//xml/xml-parser:parser_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/util/jdom:jdom_test_lib",
     "//platform/syntax/syntax-psi:psi_test_lib",
+    "//platform/syntax/syntax-util:util_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//java/java-psi-impl:psi-impl_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//platform/statistics:statistics_test_lib",
     "//platform/threadDumpParser:threadDumpParser_test_lib",
     "//platform/code-style-impl:codeStyle-impl_test_lib",

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

@@ -16,7 +16,6 @@
             <arrayArg name="pluginClasspaths">
               <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
-            <arrayArg name="pluginOptions" />
           </arrayArguments>
         </compilerArguments>
       </configuration>
@@ -30,24 +29,29 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
-    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.xml.parser" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <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" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.util" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.threadDumpParser" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />

java/java-frontback-psi-api/BUILD.bazel

@@ -20,8 +20,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//java/java-syntax:syntax",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
-  ],
-  exports = ["//java/java-syntax:syntax"]
+  ]
 )
 
 jvm_library(
@@ -30,10 +29,6 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   kotlinc_opts = "@community//:k8",
-  exports = [
-    "//java/java-syntax:syntax",
-    "//java/java-syntax:syntax_test_lib",
-  ],
   runtime_deps = [
     ":frontback-psi",
     "//platform/util:util_test_lib",

java/java-frontback-psi-api/intellij.java.frontback.psi.iml

@@ -27,7 +27,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.java.syntax" exported="" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
   </component>
 </module>

java/java-frontback-psi-impl/BUILD.bazel

@@ -25,11 +25,8 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//libraries/kotlinx/serialization/core",
     "//platform/syntax/syntax-psi:psi",
+    "//java/java-syntax:syntax",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
-  ],
-  exports = [
-    "//java/java-frontback-psi-api:frontback-psi",
-    "//platform/core-impl",
   ]
 )
 
@@ -39,12 +36,6 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   kotlinc_opts = "@community//:k8",
-  exports = [
-    "//java/java-frontback-psi-api:frontback-psi",
-    "//java/java-frontback-psi-api:frontback-psi_test_lib",
-    "//platform/core-impl",
-    "//platform/core-impl:core-impl_test_lib",
-  ],
   runtime_deps = [
     ":frontback-psi-impl",
     "//java/java-frontback-psi-api:frontback-psi_test_lib",
@@ -56,6 +47,7 @@ jvm_library(
     "//libraries/fastutil:fastutil_test_lib",
     "//libraries/kotlinx/serialization/core:core_test_lib",
     "//platform/syntax/syntax-psi:psi_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
   ]
 )

java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml

@@ -16,7 +16,6 @@
             <arrayArg name="pluginClasspaths">
               <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
-            <arrayArg name="pluginOptions" />
           </arrayArguments>
         </compilerArguments>
       </configuration>
@@ -31,9 +30,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.platform.util" />
@@ -41,6 +40,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
   </component>
 </module>

java/java-frontback-tests/BUILD.bazel

@@ -39,6 +39,8 @@ jvm_library(
     "//platform/core-api:core_test_lib",
     "//platform/core-ui",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/editor-ui-api:editor-ui",
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/projectModel-api:projectModel",
@@ -46,8 +48,11 @@ jvm_library(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/java-frontback-psi-impl:frontback-psi-impl",
     "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/testFramework/junit5",
     "//platform/testFramework/junit5:junit5_test_lib",
     "//platform/backend/workspace",
@@ -62,10 +67,16 @@ jvm_library(
     "//java/testFramework/shared:shared_test_lib",
     "//platform/syntax/syntax-psi:psi",
     "//platform/syntax/syntax-psi:psi_test_lib",
+    "//platform/syntax/syntax-util:util",
+    "//platform/syntax/syntax-util:util_test_lib",
     "//java/java-syntax:syntax",
     "//java/java-syntax:syntax_test_lib",
     "//platform/syntax/syntax-tree:tree",
     "//platform/syntax/syntax-tree:tree_test_lib",
+    "//platform/lang-api:lang",
+    "//platform/lang-api:lang_test_lib",
+    "//java/java-psi-api:psi",
+    "//java/java-psi-api:psi_test_lib",
     "@lib//:jet_check",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
@@ -89,6 +100,7 @@ jvm_library(
   runtime_deps = [
     ":frontback-tests",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.frontback.tests` end

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

@@ -15,11 +15,14 @@
     <orderEntry type="module" module-name="intellij.platform.codeStyle" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.frontback.impl" scope="TEST" />
@@ -27,8 +30,11 @@
     <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.platform.syntax.util" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.syntax" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.syntax.tree" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.psi" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jetCheck" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />

java/java-impl-inspections/BUILD.bazel

@@ -17,6 +17,7 @@ jvm_library(
     "//java/openapi:java",
     "//java/java-analysis-impl:analysis-impl",
     "//libraries/stream",
+    "//java/java-psi-api:psi",
     "//java/java-impl:impl",
     "//java/java-indexing-api:indexing",
     "//platform/analysis-api:analysis",
@@ -26,6 +27,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//libraries/fastutil",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/compiler/openapi:java-compiler",
     "//libraries/asm",
     "//java/java-impl-refactorings:impl-refactorings",
@@ -37,14 +39,17 @@ jvm_library(
     "//platform/usageView",
     "//platform/backend/workspace",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//platform/util/text-matching",
     "//java/codeserver/highlighting",
     "//java/codeserver/core",
     "//platform/workspace/storage",
     "//java/java-syntax:syntax",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//xml/xml-psi-api:psi",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
     "//platform/util/concurrency",
+    "//platform/lang-api:lang",
   ]
 )
 
@@ -58,6 +63,7 @@ jvm_library(
     "//java/openapi:java_test_lib",
     "//java/java-analysis-impl:analysis-impl_test_lib",
     "//libraries/stream:stream_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//java/java-impl:impl_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
     "//platform/analysis-api:analysis_test_lib",
@@ -67,6 +73,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl_test_lib",
     "//libraries/fastutil:fastutil_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//java/compiler/openapi:java-compiler_test_lib",
     "//libraries/asm:asm_test_lib",
     "//java/java-impl-refactorings:impl-refactorings_test_lib",
@@ -78,14 +85,17 @@ jvm_library(
     "//platform/usageView:usageView_test_lib",
     "//platform/backend/workspace:workspace_test_lib",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/util/text-matching:text-matching_test_lib",
     "//java/codeserver/highlighting:highlighting_test_lib",
     "//java/codeserver/core:core_test_lib",
     "//platform/workspace/storage:storage_test_lib",
     "//java/java-syntax:syntax_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//xml/xml-psi-api:psi_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
+    "//platform/lang-api:lang_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.impl.inspections` end

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

@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.analysis.impl" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
@@ -20,6 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
@@ -31,13 +33,16 @@
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <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.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
 </module>

java/java-impl-refactorings/BUILD.bazel

@@ -36,12 +36,15 @@ jvm_library(
     "//platform/refactoring",
     "//platform/statistics",
     "//java/openapi:java",
+    "//java/java-syntax:syntax",
     "//java/java-psi-impl:psi-impl",
     "//java/java-impl:impl",
     "//java/jsp-openapi:jsp",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/usageView",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
+    "//platform/progress/shared:ide-progress",
     "//libraries/stream",
     "//platform/code-style-impl:codeStyle-impl",
     "//libraries/fastutil",
@@ -49,12 +52,15 @@ jvm_library(
     "//platform/usageView-impl",
     "//platform/util/diff",
     "//platform/util/jdom",
+    "//platform/util:util-ui",
     "//platform/core-ui",
     "//xml/xml-psi-api:psi",
     "//java/codeserver/core",
     "//platform/execution",
     "//platform/forms_rt:java-guiForms-rt",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
+    "//uast/uast-common-ide:ide",
   ]
 )
 
@@ -87,12 +93,15 @@ jvm_library(
     "//platform/refactoring:refactoring_test_lib",
     "//platform/statistics:statistics_test_lib",
     "//java/openapi:java_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//java/java-psi-impl:psi-impl_test_lib",
     "//java/java-impl:impl_test_lib",
     "//java/jsp-openapi:jsp_test_lib",
     "//platform/structure-view-impl:structureView-impl_test_lib",
     "//platform/usageView:usageView_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
+    "//platform/progress/shared:ide-progress_test_lib",
     "//libraries/stream:stream_test_lib",
     "//platform/code-style-impl:codeStyle-impl_test_lib",
     "//libraries/fastutil:fastutil_test_lib",
@@ -100,12 +109,15 @@ jvm_library(
     "//platform/usageView-impl:usageView-impl_test_lib",
     "//platform/util/diff:diff_test_lib",
     "//platform/util/jdom:jdom_test_lib",
+    "//platform/util:util-ui_test_lib",
     "//platform/core-ui:core-ui_test_lib",
     "//xml/xml-psi-api:psi_test_lib",
     "//java/codeserver/core:core_test_lib",
     "//platform/execution:execution_test_lib",
     "//platform/forms_rt:java-guiForms-rt_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
+    "//uast/uast-common-ide:ide_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.impl.refactorings` end

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

@@ -30,12 +30,15 @@
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.jsp" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide.progress" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
@@ -43,11 +46,14 @@
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.diff" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <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" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
+    <orderEntry type="module" module-name="intellij.platform.uast.ide" />
   </component>
 </module>

java/java-impl/BUILD.bazel

@@ -57,6 +57,7 @@ jvm_library(
     "//platform/execution-impl",
     "//java/jsp-openapi:jsp",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/jsp-spi",
     "//java/execution/openapi:java-execution",
     "//xml/dom-impl",
@@ -64,6 +65,7 @@ jvm_library(
     "//platform/icons",
     "//java/java-psi-impl:psi-impl",
     "//java/java-frontback-impl:frontback-impl",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//RegExpSupport:regexp",
     "//java/java-indexing-impl:indexing-impl",
     "//java/java-indexing-api:indexing",
@@ -86,16 +88,22 @@ jvm_library(
     "//platform/statistics",
     "//libraries/fastutil",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//platform/code-style-impl:codeStyle-impl",
     "//platform/platform-util-io-impl:ide-util-io-impl",
+    "//platform/platform-util-io:ide-util-io",
     "//platform/workspace/storage",
     "//platform/ml-api:ml",
     "//platform/util/text-matching",
+    "//platform/util:util-ui",
+    "//platform/util-ex",
     "//platform/workspace/jps",
     "//platform/platform-impl/internal",
     "//platform/backend/workspace",
     "//libraries/caffeine",
     "//platform/platform-impl:ide-impl",
+    "//platform/progress/shared:ide-progress",
+    "//platform/favoritesTreeView",
     "//platform/markdown-utils",
     "//libraries/markdown",
     "//platform/threadDumpParser",
@@ -105,11 +113,13 @@ jvm_library(
     "//java/codeserver/highlighting",
     "//java/codeserver/core",
     "//xml/xml-psi-api:psi",
+    "//xml/xml-parser:parser",
     "//java/java-syntax:syntax",
     "//java/java-psi-api:psi",
     "//platform/execution",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
+    "//platform/lang-api:lang",
   ],
   exports = [
     "//java/openapi:java",
@@ -119,7 +129,6 @@ jvm_library(
     "//java/java-indexing-impl:indexing-impl",
     "//java/java-analysis-impl:analysis-impl",
     "//java/java-structure-view:structureView",
-    "//platform/statistics",
   ],
   runtime_deps = ["@lib//:jaxb-runtime"]
 )
@@ -189,6 +198,7 @@ jvm_library(
     "//java/jsp-openapi:jsp",
     "//java/jsp-openapi:jsp_test_lib",
     "//platform/ide-core-impl",
+    "//platform/ide-core",
     "//java/jsp-spi",
     "//java/jsp-spi:jsp-spi_test_lib",
     "//java/execution/openapi:java-execution",
@@ -203,6 +213,8 @@ jvm_library(
     "//java/java-psi-impl:psi-impl_test_lib",
     "//java/java-frontback-impl:frontback-impl",
     "//java/java-frontback-impl:frontback-impl_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//RegExpSupport:regexp",
     "//RegExpSupport:regexp_test_lib",
     "//java/java-indexing-impl:indexing-impl",
@@ -246,9 +258,12 @@ jvm_library(
     "//libraries/fastutil:fastutil_test_lib",
     "//platform/core-ui",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/code-style-impl:codeStyle-impl",
     "//platform/code-style-impl:codeStyle-impl_test_lib",
     "//platform/platform-util-io-impl:ide-util-io-impl",
+    "//platform/platform-util-io:ide-util-io",
     "//plugins/completion-ml-ranking",
     "//plugins/completion-ml-ranking:completion-ml-ranking_test_lib",
     "//platform/workspace/storage",
@@ -257,6 +272,10 @@ jvm_library(
     "//platform/ml-api:ml_test_lib",
     "//platform/util/text-matching",
     "//platform/util/text-matching:text-matching_test_lib",
+    "//platform/util:util-ui",
+    "//platform/util:util-ui_test_lib",
+    "//platform/util-ex",
+    "//platform/util-ex:util-ex_test_lib",
     "//platform/workspace/jps",
     "//platform/workspace/jps:jps_test_lib",
     "//platform/platform-impl/internal",
@@ -265,6 +284,8 @@ jvm_library(
     "//libraries/caffeine",
     "//libraries/caffeine:caffeine_test_lib",
     "//platform/platform-impl:ide-impl",
+    "//platform/progress/shared:ide-progress",
+    "//platform/favoritesTreeView",
     "//platform/markdown-utils",
     "//platform/markdown-utils:markdown-utils_test_lib",
     "//libraries/markdown",
@@ -283,6 +304,8 @@ jvm_library(
     "//java/codeserver/core:core_test_lib",
     "//xml/xml-psi-api:psi",
     "//xml/xml-psi-api:psi_test_lib",
+    "//xml/xml-parser:parser",
+    "//xml/xml-parser:parser_test_lib",
     "//java/java-syntax:syntax",
     "//java/java-syntax:syntax_test_lib",
     "//java/java-psi-api:psi",
@@ -295,6 +318,8 @@ jvm_library(
     "//libraries/kotlinx/serialization/core:core_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
+    "//platform/lang-api:lang",
+    "//platform/lang-api:lang_test_lib",
   ],
   exports = [
     "//java/openapi:java",
@@ -311,16 +336,18 @@ jvm_library(
     "//java/java-analysis-impl:analysis-impl_test_lib",
     "//java/java-structure-view:structureView",
     "//java/java-structure-view:structureView_test_lib",
-    "//platform/statistics",
-    "//platform/statistics:statistics_test_lib",
   ],
   runtime_deps = [
     "//platform/platform-impl/concurrency:concurrency_test_lib",
     "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib",
     "//platform/ide-core-impl:ide-core-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/platform-util-io-impl:ide-util-io-impl_test_lib",
+    "//platform/platform-util-io:ide-util-io_test_lib",
     "//platform/platform-impl/internal:internal_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
+    "//platform/progress/shared:ide-progress_test_lib",
+    "//platform/favoritesTreeView:favoritesTreeView_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.impl` end

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

@@ -62,6 +62,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.jsp" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.jsp.spi" />
     <orderEntry type="module" module-name="intellij.java.execution" />
     <orderEntry type="module" module-name="intellij.xml.dom.impl" />
@@ -69,6 +70,7 @@
     <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" />
     <orderEntry type="module" module-name="intellij.java.frontback.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.regexp" />
     <orderEntry type="module" module-name="intellij.java.indexing.impl" exported="" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
@@ -106,20 +108,26 @@
     </orderEntry>
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
-    <orderEntry type="module" module-name="intellij.platform.statistics" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.completionMlRanking" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.platform.ml" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
     <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.progress" />
+    <orderEntry type="module" module-name="intellij.platform.ide.favoritesTreeView" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="module" module-name="intellij.libraries.markdown" />
     <orderEntry type="module" module-name="intellij.platform.threadDumpParser" />
@@ -129,12 +137,14 @@
     <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.xml.parser" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.common" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
   <component name="copyright">
     <Base>

java/java-indexing-api/BUILD.bazel

@@ -17,8 +17,10 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//java/java-psi-api:psi",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/indexing-api:indexing",
     "//platform/util",
+    "//platform/util/base",
     "//platform/util/concurrency",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
   ],
@@ -34,8 +36,10 @@ jvm_library(
     ":indexing",
     "//platform/core-api:core_test_lib",
     "//java/java-psi-api:psi_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/indexing-api:indexing_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util/base:base_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/backend:backend_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",

java/java-indexing-api/intellij.java.indexing.iml

@@ -11,8 +11,10 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />

java/java-indexing-impl/BUILD.bazel

@@ -18,6 +18,7 @@ jvm_library(
     "//java/java-psi-impl:psi-impl",
     "//platform/util/concurrency",
     "//platform/core-api:core",
+    "//platform/core-impl",
     "//platform/indexing-api:indexing",
     "//platform/indexing-impl",
     "//jps/model-api:model",
@@ -25,18 +26,20 @@ jvm_library(
     "//platform/projectModel-impl",
     "//platform/util",
     "//platform/util/nanoxml",
+    "//platform/util/multiplatform",
+    "//platform/util/base",
     "//java/java-indexing-api:indexing",
     "@lib//:kotlin-stdlib",
     "//libraries/fastutil",
     "//java/codeserver/core",
     "//java/java-syntax:syntax",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/workspace/jps",
     "//platform/workspace/storage",
     "//platform/backend/workspace",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
   ],
   exports = [
-    "//java/java-psi-api:psi",
     "//java/java-psi-impl:psi-impl",
     "//platform/indexing-api:indexing",
     "//platform/indexing-impl",
@@ -49,8 +52,6 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   exports = [
-    "//java/java-psi-api:psi",
-    "//java/java-psi-api:psi_test_lib",
     "//java/java-psi-impl:psi-impl",
     "//java/java-psi-impl:psi-impl_test_lib",
     "//platform/indexing-api:indexing",
@@ -64,6 +65,7 @@ jvm_library(
     "//java/java-psi-impl:psi-impl_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/indexing-api:indexing_test_lib",
     "//platform/indexing-impl:indexing-impl_test_lib",
     "//jps/model-api:model_test_lib",
@@ -71,10 +73,13 @@ jvm_library(
     "//platform/projectModel-impl:projectModel-impl_test_lib",
     "//platform/util:util_test_lib",
     "//platform/util/nanoxml:nanoxml_test_lib",
+    "//platform/util/multiplatform:multiplatform_test_lib",
+    "//platform/util/base:base_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
     "//libraries/fastutil:fastutil_test_lib",
     "//java/codeserver/core:core_test_lib",
     "//java/java-syntax:syntax_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/workspace/jps:jps_test_lib",
     "//platform/workspace/storage:storage_test_lib",
     "//platform/backend/workspace:workspace_test_lib",

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

@@ -8,10 +8,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.java.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
@@ -19,11 +20,14 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
+    <orderEntry type="module" module-name="intellij.platform.util.multiplatform" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />

java/java-promo/BUILD.bazel

@@ -16,16 +16,19 @@ jvm_library(
   deps = [
     "//platform/lang-core",
     "//platform/util",
+    "//platform/util:util-ui",
     "@lib//:kotlin-stdlib",
     "//java/openapi:java",
     "//java/idea-ui:ui",
     "//platform/platform-impl:ide-impl",
+    "//platform/ide-core",
     "//platform/extensions",
     "//platform/core-api:core",
     "//xml/xml-psi-api:psi",
     "//platform/lang-impl",
     "//platform/projectModel-api:projectModel",
     "//platform/analysis-api:analysis",
+    "//platform/editor-ui-api:editor-ui",
   ]
 )
 
@@ -38,15 +41,18 @@ jvm_library(
     ":promo",
     "//platform/lang-core:lang-core_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util:util-ui_test_lib",
     "//java/openapi:java_test_lib",
     "//java/idea-ui:ui_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/extensions:extensions_test_lib",
     "//platform/core-api:core_test_lib",
     "//xml/xml-psi-api:psi_test_lib",
     "//platform/lang-impl:lang-impl_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/analysis-api:analysis_test_lib",
+    "//platform/editor-ui-api:editor-ui_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.promo` end

java/java-promo/intellij.java.promo.iml

@@ -10,15 +10,18 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.extensions" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
   </component>
 </module>

java/java-psi-api/BUILD.bazel

@@ -17,13 +17,14 @@ jvm_library(
   deps = [
     "//platform/core-api:core",
     "//platform/util",
+    "//platform/util/multiplatform",
+    "//platform/util/base",
     "//java/java-frontback-psi-api:frontback-psi",
     "@lib//:kotlin-stdlib",
     "//java/java-syntax:syntax",
     "//libraries/fastutil",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
-  ],
-  exports = ["//java/java-frontback-psi-api:frontback-psi"]
+  ]
 )
 
 jvm_library(
@@ -32,14 +33,12 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   kotlinc_opts = "@community//:k8",
-  exports = [
-    "//java/java-frontback-psi-api:frontback-psi",
-    "//java/java-frontback-psi-api:frontback-psi_test_lib",
-  ],
   runtime_deps = [
     ":psi",
     "//platform/core-api:core_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util/multiplatform:multiplatform_test_lib",
+    "//platform/util/base:base_test_lib",
     "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//java/java-syntax:syntax_test_lib",
     "//libraries/fastutil:fastutil_test_lib",

java/java-psi-api/intellij.java.psi.iml

@@ -26,7 +26,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util.multiplatform" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />

java/java-psi-impl/BUILD.bazel

@@ -17,20 +17,22 @@ jvm_library(
   deps = [
     "//java/java-psi-api:psi",
     "//java/java-frontback-psi-impl:frontback-psi-impl",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/core-api:core",
     "//platform/core-impl",
     "//libraries/asm",
     "//platform/util",
+    "//platform/util/multiplatform",
+    "//platform/util/base",
     "//libraries/stream",
     "//libraries/fastutil",
     "//java/java-syntax:syntax",
     "//platform/syntax/syntax-psi:psi",
+    "//platform/syntax/syntax-util:util",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
   ],
   exports = [
-    "//java/java-psi-api:psi",
     "//java/java-frontback-psi-impl:frontback-psi-impl",
-    "//platform/core-impl",
     "//platform/syntax/syntax-psi:psi",
   ]
 )
@@ -42,12 +44,8 @@ jvm_library(
   srcs = glob([], allow_empty = True),
   kotlinc_opts = "@community//:k8",
   exports = [
-    "//java/java-psi-api:psi",
-    "//java/java-psi-api:psi_test_lib",
     "//java/java-frontback-psi-impl:frontback-psi-impl",
     "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib",
-    "//platform/core-impl",
-    "//platform/core-impl:core-impl_test_lib",
     "//platform/syntax/syntax-psi:psi",
     "//platform/syntax/syntax-psi:psi_test_lib",
   ],
@@ -55,14 +53,18 @@ jvm_library(
     ":psi-impl",
     "//java/java-psi-api:psi_test_lib",
     "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/core-impl:core-impl_test_lib",
     "//libraries/asm:asm_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util/multiplatform:multiplatform_test_lib",
+    "//platform/util/base:base_test_lib",
     "//libraries/stream:stream_test_lib",
     "//libraries/fastutil:fastutil_test_lib",
     "//java/java-syntax:syntax_test_lib",
     "//platform/syntax/syntax-psi:psi_test_lib",
+    "//platform/syntax/syntax-util:util_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
   ]
 )

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

@@ -24,16 +24,20 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.java.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.multiplatform" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.util" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
   </component>
 </module>

java/java-structure-view/BUILD.bazel

@@ -15,11 +15,14 @@ jvm_library(
   resources = [":structureView_resources"],
   deps = [
     "//platform/core-api:core",
+    "//platform/core-impl",
     "//platform/editor-ui-api:editor-ui",
     "//platform/structure-view-impl:structureView-impl",
+    "//java/java-psi-api:psi",
     "//java/java-psi-impl:psi-impl",
     "//platform/util:util-ui",
     "//java/java-analysis-impl:analysis-impl",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//platform/platform-api:ide",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
   ]
@@ -33,11 +36,14 @@ jvm_library(
   runtime_deps = [
     ":structureView",
     "//platform/core-api:core_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/structure-view-impl:structureView-impl_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//java/java-psi-impl:psi-impl_test_lib",
     "//platform/util:util-ui_test_lib",
     "//java/java-analysis-impl:analysis-impl_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/platform-api:ide_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
   ]

java/java-structure-view/intellij.java.structureView.iml

@@ -9,11 +9,14 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.java.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
   </component>

java/java-syntax/BUILD.bazel

@@ -36,10 +36,6 @@ jvm_library(
     "//platform/util/multiplatform",
     "//platform/syntax/syntax-util:util",
     "//platform/syntax/syntax-extensions:extensions",
-  ],
-  exports = [
-    "//platform/syntax/syntax-api:syntax",
-    "//platform/syntax/syntax-util:util",
   ]
 )
 
@@ -49,12 +45,6 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   kotlinc_opts = ":custom_syntax",
-  exports = [
-    "//platform/syntax/syntax-api:syntax",
-    "//platform/syntax/syntax-api:syntax_test_lib",
-    "//platform/syntax/syntax-util:util",
-    "//platform/syntax/syntax-util:util_test_lib",
-  ],
   runtime_deps = [
     ":syntax",
     "//platform/syntax/syntax-api:syntax_test_lib",

java/java-syntax/intellij.java.syntax.iml

@@ -25,13 +25,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.syntax" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.syntax" />
     <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="" />
+    <orderEntry type="module" module-name="intellij.platform.syntax.util" />
     <orderEntry type="module" module-name="intellij.platform.syntax.extensions" />
   </component>
 </module>

java/java-tests/BUILD.bazel

@@ -183,6 +183,8 @@ jvm_library(
     "//xml/xml-analysis-impl:analysis-impl_test_lib",
     "//xml/xml-psi-api:psi",
     "//xml/xml-psi-api:psi_test_lib",
+    "//xml/xml-parser:parser",
+    "//xml/xml-parser:parser_test_lib",
     "//xml/xml-psi-impl:psi-impl",
     "//xml/xml-psi-impl:psi-impl_test_lib",
     "@lib//:kotlin-test",
@@ -229,10 +231,14 @@ jvm_library(
     "//platform/code-style-impl:codeStyle-impl",
     "//platform/code-style-impl:codeStyle-impl_test_lib",
     "//platform/platform-util-io:ide-util-io",
+    "//platform/ide-core",
+    "//platform/progress/shared:ide-progress",
     "//platform/service-container",
     "//platform/service-container:service-container_test_lib",
     "//java/java-frontback-tests:frontback-tests",
     "//java/java-frontback-tests:frontback-tests_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "@lib//:junit5",
     "//platform/lang-api:lang",
     "//platform/lang-api:lang_test_lib",
@@ -253,10 +259,16 @@ jvm_library(
     "//platform/util:util_test_lib",
     "//platform/core-api:core",
     "//platform/core-api:core_test_lib",
+    "//platform/core-impl",
+    "//platform/core-impl:core-impl_test_lib",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
     "//platform/util/coroutines",
     "//platform/util/coroutines:coroutines_test_lib",
+    "//platform/util:util-ui",
+    "//platform/util:util-ui_test_lib",
+    "//platform/util-ex",
+    "//platform/util-ex:util-ex_test_lib",
     "//platform/navbar/testFramework",
     "//platform/navbar/testFramework:testFramework_test_lib",
     "//java/unscramble",
@@ -297,6 +309,8 @@ jvm_library(
     "//plugins/grazie/src:core_test_lib",
     "//platform/testFramework/junit5/codeInsight",
     "//platform/testFramework/junit5/codeInsight:codeInsight_test_lib",
+    "//java/java-psi-api:psi",
+    "//java/java-psi-api:psi_test_lib",
     "//java/java-psi-impl:psi-impl",
     "//java/java-psi-impl:psi-impl_test_lib",
     "//platform/execution",
@@ -316,6 +330,8 @@ jvm_library(
     "//platform/locking-impl:locking-impl_test_lib",
     "//platform/smRunner:smRunner-tests",
     "//platform/smRunner:smRunner-tests_test_lib",
+    "//platform/testRunner",
+    "//platform/testRunner:testRunner_test_lib",
   ],
   exports = [
     "//plugins/java-i18n",
@@ -334,6 +350,8 @@ jvm_library(
     "//platform/platform-impl/internal:internal_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
     "//platform/platform-util-io:ide-util-io_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
+    "//platform/progress/shared:ide-progress_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.tests` end

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

@@ -75,6 +75,7 @@
     <orderEntry type="module" module-name="intellij.xml.analysis" />
     <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.parser" 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" />
@@ -100,8 +101,11 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.progress" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
     <orderEntry type="module" module-name="intellij.java.frontback.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5Suites" level="project" />
@@ -113,8 +117,11 @@
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.navbar.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.unscramble" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.threadDumpParser" scope="TEST" />
@@ -135,6 +142,7 @@
     <orderEntry type="module" module-name="intellij.platform.syntax.scripts" scope="TEST" />
     <orderEntry type="module" module-name="intellij.grazie.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5.codeInsight" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jetCheck" level="project" />
@@ -145,5 +153,6 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.locking.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.smRunner.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" scope="TEST" />
   </component>
 </module>

java/jsp-spi/BUILD.bazel

@@ -22,6 +22,8 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//xml/xml-psi-api:psi",
     "//java/jsp-base-openapi:jsp-base",
+    "//platform/ide-core",
+    "//java/java-psi-api:psi",
   ],
   exports = [
     "//java/jsp-openapi:jsp",
@@ -52,6 +54,8 @@ jvm_library(
     "//xml/xml-psi-api:psi_test_lib",
     "//java/jsp-base-openapi:jsp-base_test_lib",
     "//platform/backend:backend_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
+    "//java/java-psi-api:psi_test_lib",
   ]
 )
 ### auto-generated section `build intellij.jsp.spi` end

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

@@ -17,6 +17,8 @@
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.jsp.base" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
   </component>
   <component name="copyright">
     <Base>

java/langInjection/BUILD.bazel

@@ -21,6 +21,8 @@ jvm_library(
   deps = [
     "//java/openapi:java",
     "//java/java-indexing-api:indexing",
+    "//java/java-syntax:syntax",
+    "//java/java-psi-api:psi",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
@@ -31,13 +33,20 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//RegExpSupport:regexp",
     "//platform/platform-api:ide",
+    "//platform/ide-core",
     "//java/java-impl:impl",
     "//plugins/IntelliLang:langInjection",
     "//platform/core-ui",
+    "//platform/core-impl",
     "//platform/util/jdom",
+    "//platform/util:util-ui",
+    "//platform/util-ex",
     "//platform/forms_rt:java-guiForms-rt",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
     "//platform/util/concurrency",
+    "//platform/lang-api:lang",
+    "//uast/uast-common-ide:ide",
     ":plugins_IntelliLang_backend_provided",
   ],
   runtime_deps = [
@@ -55,6 +64,8 @@ jvm_library(
     ":langInjection",
     "//java/openapi:java_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
+    "//java/java-syntax:syntax_test_lib",
+    "//java/java-psi-api:psi_test_lib",
     "//platform/analysis-api:analysis_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/editor-ui-api:editor-ui_test_lib",
@@ -65,17 +76,24 @@ jvm_library(
     "//platform/projectModel-api:projectModel_test_lib",
     "//RegExpSupport:regexp_test_lib",
     "//platform/platform-api:ide_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//java/java-impl:impl_test_lib",
     "//plugins/IntelliLang:langInjection_test_lib",
     "//java/langInjection/jps:jps_test_lib",
     "//platform/core-ui:core-ui_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
     "//platform/util/jdom:jdom_test_lib",
+    "//platform/util:util-ui_test_lib",
+    "//platform/util-ex:util-ex_test_lib",
     "//plugins/IntelliLang/backend",
     "//plugins/IntelliLang/backend:backend_test_lib",
     "//platform/forms_rt:java-guiForms-rt_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//platform/backend:backend_test_lib",
     "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
+    "//platform/lang-api:lang_test_lib",
+    "//uast/uast-common-ide:ide_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.langInjection` end

java/langInjection/intellij.java.langInjection.iml

@@ -10,6 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
+    <orderEntry type="module" module-name="intellij.java.syntax" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
@@ -20,16 +22,23 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.regexp" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" />
     <orderEntry type="module" module-name="intellij.java.langInjection.jps" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.langInjection.backend" scope="PROVIDED" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.uast.ide" />
   </component>
   <component name="copyright">
     <Base>

java/langInjection/jps/BUILD.bazel

@@ -23,6 +23,7 @@ jvm_library(
     "//jps/model-serialization",
     "//libraries/asm",
     "//platform/util/jdom",
+    "//platform/util/base",
     "@lib//:jetbrains-annotations",
   ]
 )
@@ -43,6 +44,7 @@ jvm_library(
     "//jps/model-serialization:model-serialization_test_lib",
     "//libraries/asm:asm_test_lib",
     "//platform/util/jdom:jdom_test_lib",
+    "//platform/util/base:base_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.langInjection.jps` end

java/langInjection/jps/intellij.java.langInjection.jps.iml

@@ -32,6 +32,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
   </component>
 </module>

java/manifest/BUILD.bazel

@@ -18,6 +18,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/projectModel-api:projectModel",
     "//platform/util",
+    "//platform/util:util-ui",
     "//platform/core-api:core",
     "//platform/platform-impl:ide-impl",
     "//platform/analysis-api:analysis",
@@ -26,6 +27,7 @@ jvm_library(
     "//platform/core-impl",
     "//java/java-psi-api:psi",
     "//java/java-impl:impl",
+    "//java/java-frontback-psi-api:frontback-psi",
     "//spellchecker",
     "//platform/core-ui",
     "//libraries/fastutil",
@@ -44,6 +46,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
     "//platform/util:util_test_lib",
+    "//platform/util:util-ui_test_lib",
     "//platform/core-api:core_test_lib",
     "//platform/platform-impl:ide-impl_test_lib",
     "//platform/analysis-api:analysis_test_lib",
@@ -56,6 +59,7 @@ jvm_library(
     "//platform/testFramework:testFramework_test_lib",
     "//java/testFramework",
     "//java/testFramework:testFramework_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
     "//spellchecker:spellchecker_test_lib",
     "//platform/core-ui:core-ui_test_lib",
     "//libraries/fastutil:fastutil_test_lib",

java/manifest/intellij.java.manifest.iml

@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
@@ -22,6 +23,7 @@
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />

java/openapi/BUILD.bazel

@@ -41,11 +41,14 @@ jvm_library(
     "//platform/icons",
     "//platform/workspace/storage",
     "//platform/platform-api:ide",
+    "//platform/ide-core",
     "//platform/lang-api:lang",
     "//platform/vcs-api:vcs",
     "//xml/dom-openapi:dom",
     "//platform/refactoring",
     "//java/java-psi-api:psi",
+    "//java/java-frontback-psi-api:frontback-psi",
+    "//java/java-syntax:syntax",
     "//java/java-indexing-api:indexing",
     "//java/java-analysis-api:analysis",
     "//platform/util:util-ui",
@@ -63,8 +66,6 @@ jvm_library(
   ],
   exports = [
     "//platform/util",
-    "//platform/lang-api:lang",
-    "//java/java-psi-api:psi",
     "//java/java-analysis-api:analysis",
   ],
   runtime_deps = ["//platform/backend"]
@@ -78,10 +79,6 @@ jvm_library(
   exports = [
     "//platform/util",
     "//platform/util:util_test_lib",
-    "//platform/lang-api:lang",
-    "//platform/lang-api:lang_test_lib",
-    "//java/java-psi-api:psi",
-    "//java/java-psi-api:psi_test_lib",
     "//java/java-analysis-api:analysis",
     "//java/java-analysis-api:analysis_test_lib",
   ],
@@ -102,11 +99,14 @@ jvm_library(
     "//platform/icons:icons_test_lib",
     "//platform/workspace/storage:storage_test_lib",
     "//platform/platform-api:ide_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
     "//platform/lang-api:lang_test_lib",
     "//platform/vcs-api:vcs_test_lib",
     "//xml/dom-openapi:dom_test_lib",
     "//platform/refactoring:refactoring_test_lib",
     "//java/java-psi-api:psi_test_lib",
+    "//java/java-frontback-psi-api:frontback-psi_test_lib",
+    "//java/java-syntax:syntax_test_lib",
     "//java/java-indexing-api:indexing_test_lib",
     "//java/java-analysis-api:analysis_test_lib",
     "//platform/util:util-ui_test_lib",