don't export ide.core.impl from lang-impl

GitOrigin-RevId: 029fef0995b0d8e6b684f463bdd856dd17021366
2026-04-21 22:11:40 +07:00 · 2024-12-01 16:16:34 +01:00
parent cccb22d78e
commit 8c77c9ed84
102 changed files with 106 additions and 5 deletions
--- a/RegExpSupport/intellij.regexp.iml
+++ b/RegExpSupport/intellij.regexp.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.xml.psi" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
  </component>
--- a/java/compiler/charts/intellij.java.compiler.charts.iml
+++ b/java/compiler/charts/intellij.java.compiler.charts.iml
@@ -27,6 +27,7 @@
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -18,6 +18,7 @@
    <orderEntry type="module" module-name="intellij.jsp" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <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.jps.build.launcher" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -38,6 +38,7 @@
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.jsp" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
--- a/java/execution/impl/intellij.java.execution.impl.iml
+++ b/java/execution/impl/intellij.java.execution.impl.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.indexing" />
--- a/java/idea-ui/intellij.java.ui.iml
+++ b/java/idea-ui/intellij.java.ui.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.compiler.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.java.impl.refactorings" />
    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
--- a/java/idea-ui/intellij.java.ui.tests.iml
+++ b/java/idea-ui/intellij.java.ui.tests.iml
@@ -15,6 +15,7 @@
    <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.java.compiler" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
--- a/java/java-features-trainer/intellij.java.featuresTrainer.iml
+++ b/java/java-features-trainer/intellij.java.featuresTrainer.iml
@@ -12,6 +12,7 @@
    <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.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.featuresTrainer" />
--- a/java/java-frontback-impl/intellij.java.frontback.impl.iml
+++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml
@@ -27,6 +27,7 @@
    <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
    <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <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" />
--- a/java/java-frontback-tests/intellij.java.frontback.tests.iml
+++ b/java/java-frontback-tests/intellij.java.frontback.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" exported="" scope="TEST" name="kotlin-test" level="project" />
    <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.java.frontback.psi.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" exported="" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.backend.workspace" scope="TEST" />
--- a/java/java-impl-inspections/intellij.java.impl.inspections.iml
+++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="library" name="ASM" level="project" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
--- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
+++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
@@ -16,6 +16,7 @@
    <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.ide.core.impl" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
    <orderEntry type="module" module-name="intellij.jsp" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <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" />
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.java.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" exported="" />
    <orderEntry type="module" module-name="intellij.java.plugin" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
--- a/json/intellij.json.iml
+++ b/json/intellij.json.iml
@@ -16,6 +16,7 @@
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="intellij.regexp" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
--- a/json/tests/intellij.json.tests.iml
+++ b/json/tests/intellij.json.tests.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" scope="TEST" name="jsonpath" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
  </component>
--- a/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml
+++ b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.jvm.analysis.quickFix" />
  </component>
 </module>
--- a/notebooks/visualization/intellij.notebooks.visualization.iml
+++ b/notebooks/visualization/intellij.notebooks.visualization.iml
@@ -37,6 +37,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
    <orderEntry type="module" module-name="intellij.notebooks.ui" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
--- a/platform/built-in-server/intellij.platform.builtInServer.tests.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.tests.iml
@@ -6,6 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
--- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml
+++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
@@ -36,6 +36,7 @@
    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.objectSerializer" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.serviceContainer" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.dvcs" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
--- a/platform/execution.dashboard/intellij.platform.execution.dashboard.iml
+++ b/platform/execution.dashboard/intellij.platform.execution.dashboard.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.execution.serviceView" />
  </component>
 </module>
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -52,6 +52,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="opentelemetry" level="project" />
    <orderEntry type="library" name="opentelemetry-semconv" level="project" />
    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -66,7 +66,7 @@
    <orderEntry type="library" name="xz" level="project" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="library" name="pty4j" level="project" />
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -18,6 +18,7 @@
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" name="gson" level="project" />
--- a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
+++ b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.lvcs" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
--- a/platform/ml-impl/intellij.platform.ml.impl.iml
+++ b/platform/ml-impl/intellij.platform.ml.impl.iml
@@ -34,6 +34,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="ngram-slp" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.util.ex" />
    <orderEntry type="module" module-name="intellij.platform.core" />
--- a/platform/navbar/backend/intellij.platform.navbar.backend.iml
+++ b/platform/navbar/backend/intellij.platform.navbar.backend.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.navbar" exported="" />
--- a/platform/navbar/frontend/intellij.platform.navbar.frontend.iml
+++ b/platform/navbar/frontend/intellij.platform.navbar.frontend.iml
@@ -12,6 +12,7 @@
    <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" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.ide.core" />
--- a/platform/navbar/shared/intellij.platform.navbar.iml
+++ b/platform/navbar/shared/intellij.platform.navbar.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" name="jetbrains-annotations" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
  </component>
 </module>
--- a/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml
+++ b/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.navbar.backend" />
    <orderEntry type="module" module-name="intellij.platform.navbar.frontend" />
  </component>
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -16,6 +16,7 @@
    <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
--- a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml
+++ b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
  </component>
 </module>
--- a/platform/smart-update/intellij.smart.update.iml
+++ b/platform/smart-update/intellij.smart.update.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" exported="" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
    <orderEntry type="module" module-name="intellij.tools.testsBootstrap" />
    <orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
--- a/platform/testRunner/intellij.platform.testRunner.iml
+++ b/platform/testRunner/intellij.platform.testRunner.iml
@@ -18,6 +18,7 @@
    <orderEntry type="library" name="fastutil-min" level="project" />
    <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.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
--- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
+++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log.graph.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="library" name="Guava" level="project" />
--- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
@@ -10,6 +10,7 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
  </component>
--- a/platform/vcs-tests/intellij.platform.vcs.tests.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.core" />
    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.diff.tests" scope="TEST" />
--- a/platform/warmup/intellij.platform.warmup.iml
+++ b/platform/warmup/intellij.platform.warmup.iml
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.core" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.ide.bootstrap" />
--- a/platform/whatsNew/intellij.platform.whatsNew.iml
+++ b/platform/whatsNew/intellij.platform.whatsNew.iml
@@ -37,6 +37,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <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.impl" />
    <orderEntry type="library" name="miglayout-swing" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="kotlinc.kotlinx-serialization-compiler-plugin" level="project" />
    <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -54,6 +54,7 @@
    <orderEntry type="library" name="miglayout-swing" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.ide.ui" />
    <orderEntry type="library" name="jackson" level="project" />
--- a/plugins/ant/intellij.ant.iml
+++ b/plugins/ant/intellij.ant.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="library" name="Ant" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
--- a/plugins/copyright/intellij.copyright.iml
+++ b/plugins/copyright/intellij.copyright.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="library" name="Velocity" level="project" />
    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
--- a/plugins/coverage/intellij.java.coverage.iml
+++ b/plugins/coverage/intellij.java.coverage.iml
@@ -64,6 +64,7 @@
    <orderEntry type="module" module-name="intellij.platform.testRunner" />
    <orderEntry type="module" module-name="intellij.testng.rt" />
    <orderEntry type="module" module-name="intellij.junit.rt" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.coverage.rt" />
    <orderEntry type="module" module-name="intellij.java.psi.impl" />
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -72,6 +72,7 @@
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
    <orderEntry type="module" module-name="intellij.smart.update" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
    <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
    <orderEntry type="module" module-name="intellij.json" />
--- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
    <orderEntry type="module" module-name="intellij.xml.analysis.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.devkit" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.devkit.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
--- a/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml
+++ b/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml
@@ -12,6 +12,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.properties.psi" />
    <orderEntry type="module" module-name="intellij.properties.psi.impl" />
    <orderEntry type="module" module-name="intellij.java.i18n" />
--- a/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml
+++ b/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.java.psi" />
--- a/plugins/eclipse/intellij.eclipse.iml
+++ b/plugins/eclipse/intellij.eclipse.iml
@@ -16,6 +16,7 @@
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.eclipse.jps" />
--- a/plugins/editorconfig/intellij.editorconfig.iml
+++ b/plugins/editorconfig/intellij.editorconfig.iml
@@ -40,6 +40,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="library" name="kotlin-reflect" level="project" />
    <orderEntry type="library" name="gson" level="project" />
--- a/plugins/evaluation-plugin/intellij.evaluationPlugin.iml
+++ b/plugins/evaluation-plugin/intellij.evaluationPlugin.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.evaluationPlugin.core" />
    <orderEntry type="module" module-name="intellij.completionMlRanking" />
    <orderEntry type="module" module-name="intellij.statsCollector" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
--- a/plugins/filePrediction/intellij.filePrediction.iml
+++ b/plugins/filePrediction/intellij.filePrediction.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
    <orderEntry type="module" module-name="intellij.vcs.git" />
--- a/plugins/filePrediction/src/com/intellij/filePrediction/FilePredictionHandler.kt
+++ b/plugins/filePrediction/src/com/intellij/filePrediction/FilePredictionHandler.kt
@@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.concurrency.SequentialTaskExecutor

@Service(Service.Level.PROJECT)
-class FilePredictionHandler(private val project: Project) : Disposable {
+internal class FilePredictionHandler(private val project: Project) : Disposable {
  companion object {
    private val LOG: Logger = Logger.getInstance(FilePredictionHandler::class.java)

--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -86,6 +86,7 @@
    <orderEntry type="library" name="opentelemetry" level="project" />
    <orderEntry type="library" name="opentelemetry-semconv" level="project" />
    <orderEntry type="module" module-name="intellij.platform.collaborationTools" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
    <orderEntry type="module" module-name="intellij.performanceTesting" />
    <orderEntry type="module" module-name="intellij.platform.ide.newUiOnboarding" />
--- a/plugins/gradle/intellij.gradle.iml
+++ b/plugins/gradle/intellij.gradle.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
    <orderEntry type="library" exported="" name="slf4j-api" level="project" />
    <orderEntry type="library" exported="" name="slf4j-jdk14" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" exported="" name="Gradle" level="project" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
--- a/plugins/gradle/java/intellij.gradle.java.iml
+++ b/plugins/gradle/java/intellij.gradle.java.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.gradle.jps" />
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.groovy" />
    <orderEntry type="module" module-name="intellij.toml" />
--- a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
+++ b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.java.indexing" />
    <orderEntry type="module" module-name="intellij.java.psi.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.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.extensions" />
    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
--- a/plugins/groovy/intellij.groovy.iml
+++ b/plugins/groovy/intellij.groovy.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.groovy.rt" />
    <orderEntry type="module" module-name="intellij.groovy.spock.rt" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
--- a/plugins/hg4idea/intellij.vcs.hg.iml
+++ b/plugins/hg4idea/intellij.vcs.hg.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.vcs.dvcs.impl" />
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -42,6 +42,7 @@
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.tasks.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
--- a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
+++ b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
@@ -35,6 +35,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.bootstrap" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="rd-core" level="project" />
    <orderEntry type="library" name="rd-swing" level="project" />
    <orderEntry type="module" module-name="intellij.platform.rd.community" />
--- a/plugins/java-decompiler/plugin/intellij.java.decompiler.iml
+++ b/plugins/java-decompiler/plugin/intellij.java.decompiler.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.java.decompiler.engine" exported="" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.psi.impl" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/plugins/java-i18n/intellij.java.i18n.iml
+++ b/plugins/java-i18n/intellij.java.i18n.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.properties" exported="" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.xml.impl" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
--- a/plugins/javaFX/intellij.javaFX.iml
+++ b/plugins/javaFX/intellij.javaFX.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.java.execution" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.xml" />
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
@@ -62,6 +62,7 @@
    <orderEntry type="module" module-name="kotlin.refactorings.k2" />
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="kotlin.searching.base" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.indices" />
    <orderEntry type="module" module-name="kotlin.ide" />
    <orderEntry type="library" name="Velocity" level="project" />
--- a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
+++ b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
@@ -34,6 +34,7 @@
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.psi" />
    <orderEntry type="module" module-name="kotlin.base.indices" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
    <orderEntry type="module" module-name="kotlin.base.project-structure" />
    <orderEntry type="module" module-name="kotlin.base.project-model" />
--- a/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml
+++ b/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.fe10.analysis" />
    <orderEntry type="module" module-name="kotlin.formatter" />
    <orderEntry type="module" module-name="kotlin.completion.impl.shared" />
--- a/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml
+++ b/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml
@@ -9,6 +9,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="kotlin-reflect" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
--- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
+++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
@@ -32,6 +32,7 @@
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="kotlinc.kotlin-scripting-jvm" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-gradle-statistics" level="project" />
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -41,6 +41,7 @@
    <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-scripting-dependencies" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-scripting-jvm" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.indices" />
--- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
+++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
@@ -24,6 +24,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="vavr" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
--- a/plugins/kotlin/kotlin.ide/kotlin.ide.iml
+++ b/plugins/kotlin/kotlin.ide/kotlin.ide.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="kotlin.base.project-structure" />
    <orderEntry type="module" module-name="kotlin.base.resources" />
    <orderEntry type="module" module-name="kotlin.base.statistics" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.project-configuration" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="kotlin.base.code-insight.minimal" />
--- a/plugins/kotlin/kotlin.performanceExtendedPlugin/kotlin.performanceExtendedPlugin.iml
+++ b/plugins/kotlin/kotlin.performanceExtendedPlugin/kotlin.performanceExtendedPlugin.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.performanceTesting" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="library" scope="PROVIDED" name="kotlinc.analysis-api-platform-interface" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="kotlinc.analysis-api" level="project" />
--- a/plugins/kotlin/project-configuration/kotlin.project-configuration.iml
+++ b/plugins/kotlin/project-configuration/kotlin.project-configuration.iml
@@ -15,6 +15,7 @@
    <orderEntry type="library" name="ASM" level="project" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.psi" />
--- a/plugins/kotlin/project-wizard/compose/kotlin.project-wizard.compose.iml
+++ b/plugins/kotlin/project-wizard/compose/kotlin.project-wizard.compose.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
--- a/plugins/kotlin/project-wizard/compose/src/org/jetbrains/kotlin/tools/composeProjectWizard/ComposeModuleBuilder.kt
+++ b/plugins/kotlin/project-wizard/compose/src/org/jetbrains/kotlin/tools/composeProjectWizard/ComposeModuleBuilder.kt
@@ -3,9 +3,11 @@ package org.jetbrains.kotlin.tools.composeProjectWizard

 import com.intellij.ide.fileTemplates.FileTemplateManager
 import com.intellij.ide.starters.local.*
-import com.intellij.ide.starters.local.StandardAssetsProvider
 import com.intellij.ide.starters.local.wizard.StarterInitialStep
-import com.intellij.ide.starters.shared.*
+import com.intellij.ide.starters.shared.KOTLIN_STARTER_LANGUAGE
+import com.intellij.ide.starters.shared.StarterLanguage
+import com.intellij.ide.starters.shared.StarterProjectType
+import com.intellij.ide.starters.shared.StarterTestRunner
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.openapi.module.Module
@@ -17,7 +19,7 @@ import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.tools.projectWizard.core.KotlinAssetsProvider
 import javax.swing.Icon

-class ComposeModuleBuilder : StarterModuleBuilder() {
+internal class ComposeModuleBuilder : StarterModuleBuilder() {
    override fun getBuilderId(): String = "ComposeModuleBuilder"
    override fun getPresentableName(): String = ComposeProjectWizardBundle.message("module.presentation.name")
    override fun getWeight(): Int = KOTLIN_WEIGHT-1
--- a/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
+++ b/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
@@ -15,6 +15,7 @@
    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
    <orderEntry type="library" name="Java Compatibility" level="project" />
    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
--- a/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
@@ -29,6 +29,7 @@
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
--- a/plugins/kotlin/test-framework/kotlin.test-framework.iml
+++ b/plugins/kotlin/test-framework/kotlin.test-framework.iml
@@ -18,6 +18,7 @@
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-jps-common" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
--- a/plugins/kotlin/tests-common/kotlin.tests-common.iml
+++ b/plugins/kotlin/tests-common/kotlin.tests-common.iml
@@ -14,6 +14,7 @@
    <orderEntry type="library" name="kotlinc.kotlin-compiler-cli" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="kotlin-test" level="project" />
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
--- a/plugins/markdown/core/intellij.markdown.iml
+++ b/plugins/markdown/core/intellij.markdown.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" name="jcef" level="project" />
--- a/plugins/maven/intellij.maven.iml
+++ b/plugins/maven/intellij.maven.iml
@@ -10,6 +10,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java" exported="" />
    <orderEntry type="module" module-name="intellij.maven.server" exported="" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/plugins/ml-local-models/intellij.ml.models.local.iml
+++ b/plugins/ml-local-models/intellij.ml.models.local.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
  </component>
--- a/plugins/performanceTesting/core/intellij.performanceTesting.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="library" name="jackson-databind" level="project" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
--- a/plugins/properties/intellij.properties.iml
+++ b/plugins/properties/intellij.properties.iml
@@ -18,6 +18,7 @@
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.structuralSearch" />
  </component>
 </module>
--- a/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml
+++ b/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.xml.psi" />
    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
--- a/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml
+++ b/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.properties.psi.impl" />
    <orderEntry type="module" module-name="intellij.properties" />
    <orderEntry type="module" module-name="intellij.xml.psi" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="library" name="fastutil-min" level="project" />
--- a/plugins/settings-sync/intellij.settingsSync.iml
+++ b/plugins/settings-sync/intellij.settingsSync.iml
@@ -44,6 +44,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="jackson" level="project" />
    <orderEntry type="library" name="jackson-databind" level="project" />
    <orderEntry type="library" name="jackson-module-kotlin" level="project" />
--- a/plugins/svn4idea/intellij.vcs.svn.tests.iml
+++ b/plugins/svn4idea/intellij.vcs.svn.tests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.vcs.testFramework" scope="TEST" />
--- a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml
+++ b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.tasks.java" />
    <orderEntry type="module" module-name="intellij.tasks.compatibility" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.testFramework" exported="" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="library" name="XmlRPC" level="project" />
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -33,6 +33,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="pty4j" level="project" />
    <orderEntry type="library" name="jna" level="project" />
--- a/plugins/testng/intellij.testng.iml
+++ b/plugins/testng/intellij.testng.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.java.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.testRunner" />
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.testng.rt" />
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -34,6 +34,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
    <orderEntry type="module" module-name="intellij.platform.diff" />
--- a/plugins/ui-designer/intellij.java.guiForms.designer.iml
+++ b/plugins/ui-designer/intellij.java.guiForms.designer.iml
@@ -11,6 +11,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.java.guiForms.compiler" exported="" />
    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
--- a/plugins/yaml/intellij.yaml.iml
+++ b/plugins/yaml/intellij.yaml.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="intellij.json.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -12,6 +12,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.python.community" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="library" name="Guava" level="project" />
--- a/uast/testFramework/intellij.platform.uast.testFramework.iml
+++ b/uast/testFramework/intellij.platform.uast.testFramework.iml
@@ -10,6 +10,7 @@
    <orderEntry type="module" module-name="intellij.platform.uast" exported="" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
  </component>
--- a/xml/impl/intellij.xml.impl.iml
+++ b/xml/impl/intellij.xml.impl.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="intellij.xml.analysis.impl" exported="" />
    <orderEntry type="module" module-name="intellij.xml.structureView.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" name="fastutil-min" level="project" />
--- a/Show More
+++ b/Show More