IJ-CR-146078 don't export core.impl

GitOrigin-RevId: ae848f09ca7574692659498bf35c82a91dc4fa6b
2026-03-22 15:19:59 +07:00 · 2024-12-29 16:28:11 +01:00
parent cc667842f7
commit 9d2a18c2c2
59 changed files with 87 additions and 38 deletions
--- a/jps/model-impl/intellij.platform.jps.model.tests.iml
+++ b/jps/model-impl/intellij.platform.jps.model.tests.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
--- a/notebooks/notebook-ui/intellij.notebooks.ui.iml
+++ b/notebooks/notebook-ui/intellij.notebooks.ui.iml
@@ -34,6 +34,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle" />
--- a/notebooks/visualization/intellij.notebooks.visualization.iml
+++ b/notebooks/visualization/intellij.notebooks.visualization.iml
@@ -42,6 +42,7 @@
    <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" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
--- a/platform/analysis-impl/intellij.platform.analysis.impl.iml
+++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml
@@ -13,6 +13,7 @@
    <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.util" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
    <orderEntry type="module" module-name="intellij.platform.extensions" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
--- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml
@@ -12,6 +12,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
+    <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.impl" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/platform/diff-impl/tests/intellij.platform.diff.tests.iml
+++ b/platform/diff-impl/tests/intellij.platform.diff.tests.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
--- a/platform/editor-ui-ex/intellij.platform.editor.ex.iml
+++ b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
@@ -8,9 +8,9 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -8,6 +8,8 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
--- a/platform/execution-impl/src/com/intellij/execution/multilaunch/design/components/UnknownItemLabel.kt
+++ b/platform/execution-impl/src/com/intellij/execution/multilaunch/design/components/UnknownItemLabel.kt
@@ -1,14 +1,13 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.execution.multilaunch.design.components

 import com.intellij.execution.ExecutionBundle
+import com.intellij.execution.multilaunch.design.tooltips.TooltipProvider
 import com.intellij.icons.AllIcons
 import com.intellij.ui.SimpleColoredComponent
 import com.intellij.ui.SimpleTextAttributes
-import com.intellij.execution.multilaunch.design.tooltips.TooltipProvider
-import org.jetbrains.annotations.ApiStatus

-@ApiStatus.Internal
-class UnknownItemLabel(private val tooltip: String) : SimpleColoredComponent(), TooltipProvider {
+internal class UnknownItemLabel(private val tooltip: String) : SimpleColoredComponent(), TooltipProvider {
  constructor() : this(TEXT.replace("<", "&lt;").replace(">", "&gt;"))

  companion object {
--- a/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml
+++ b/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="jetbrains-annotations" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
--- a/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.iml
+++ b/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util" />
  </component>
 </module>
--- a/platform/indexing-tests/intellij.platform.indexing.tests.iml
+++ b/platform/indexing-tests/intellij.platform.indexing.tests.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
  </component>
--- a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
+++ b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
@@ -353,6 +353,7 @@
    </orderEntry>
    <orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
    <orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-test" level="project" />
  </component>
 </module>
--- a/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml
+++ b/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
  </component>
--- a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
+++ b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
@@ -29,6 +29,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.ui" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
--- a/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml
+++ b/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml
@@ -7,6 +7,8 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
--- a/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
+++ b/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
@@ -32,6 +32,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.ml" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -38,7 +38,7 @@
    <orderEntry type="library" name="jna" level="project" />
    <orderEntry type="library" name="winp" level="project" />
    <orderEntry type="library" name="swingx" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="library" name="miglayout-swing" level="project" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
@@ -47,7 +47,7 @@
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
-    <orderEntry type="module" module-name="intellij.platform.editor.ex" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="library" name="http-client" level="project" />
    <orderEntry type="module" module-name="intellij.platform.diff" />
--- a/platform/platform-impl/remote/intellij.platform.ide.remote.iml
+++ b/platform/platform-impl/remote/intellij.platform.ide.remote.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
    <orderEntry type="module" module-name="intellij.platform.lang.core" />
--- a/platform/remoteDev-util/intellij.remoteDev.util.iml
+++ b/platform/remoteDev-util/intellij.remoteDev.util.iml
@@ -69,6 +69,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.ui" />
    <orderEntry type="module" module-name="intellij.platform.lang.core" />
    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.runtime.product" />
    <orderEntry type="module" module-name="intellij.platform.execution" />
    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
--- a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
+++ b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
@@ -110,7 +110,9 @@ object CodeWithMeClientDownloader {
  }

  private val minimumClientBuildWithBundledJre = BuildNumber("", 223, 4374)
-  fun isClientWithBundledJre(clientBuildNumber: BuildNumber) = clientBuildNumber.isSnapshot || clientBuildNumber > minimumClientBuildWithBundledJre
+  fun isClientWithBundledJre(clientBuildNumber: BuildNumber): Boolean {
+    return clientBuildNumber.isSnapshot || clientBuildNumber > minimumClientBuildWithBundledJre
+  }

  @ApiStatus.Internal
  class DownloadableFileData(
--- a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
+++ b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <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.scriptDebugger.protocolReaderRuntime" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
--- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
+++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
@@ -7,6 +7,8 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.scriptDebugger.backend" />
--- a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
+++ b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" exported="" name="gson" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -9,6 +9,8 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
--- a/platform/starter/intellij.platform.starter.iml
+++ b/platform/starter/intellij.platform.starter.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.bootstrap" />
    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/platform/testFramework/extensions/intellij.platform.testExtensions.iml
+++ b/platform/testFramework/extensions/intellij.platform.testExtensions.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.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.execution" />
--- a/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml
+++ b/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml
@@ -10,6 +10,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="library" name="jetbrains-annotations" level="project" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/platform/usageView/intellij.platform.usageView.iml
+++ b/platform/usageView/intellij.platform.usageView.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <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" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.editor" />
--- a/platform/util/intellij.platform.util.tests.iml
+++ b/platform/util/intellij.platform.util.tests.iml
@@ -11,6 +11,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
--- a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
+++ b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
--- a/platform/vcs-impl/lang/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.kt
+++ b/platform/vcs-impl/lang/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.kt
@@ -34,18 +34,15 @@ import com.intellij.util.ui.UIUtil.getWarningIcon
 import com.intellij.vcs.commit.isPostCommitCheck
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.annotations.Nls

-@ApiStatus.Internal
-class TodoCheckinHandlerFactory : CheckinHandlerFactory() {
+private class TodoCheckinHandlerFactory : CheckinHandlerFactory() {
  override fun createHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler {
    return TodoCheckinHandler(panel.project)
  }
 }

-@ApiStatus.Internal
-class TodoCommitProblem(private val worker: TodoCheckinHandlerWorker,
+internal class TodoCommitProblem(private val worker: TodoCheckinHandlerWorker,
                        private val isPostCommit: Boolean) : CommitProblemWithDetails {
  override val text: String get() = message("label.todo.items.found", worker.inOneList().size)

@@ -61,8 +58,7 @@ class TodoCommitProblem(private val worker: TodoCheckinHandlerWorker,
    get() = message("todo.in.new.review.button")
 }

-@ApiStatus.Internal
-class TodoCheckinHandler(private val project: Project) : CheckinHandler(), CommitCheck, DumbAware {
+internal class TodoCheckinHandler(private val project: Project) : CheckinHandler(), CommitCheck, DumbAware {
  private val settings: VcsConfiguration get() = VcsConfiguration.getInstance(project)
  private val todoSettings: TodoPanelSettings get() = settings.myTodoPanelSettings

--- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <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" />
--- a/platform/whatsNew/intellij.platform.whatsNew.iml
+++ b/platform/whatsNew/intellij.platform.whatsNew.iml
@@ -32,6 +32,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/plugins/changeReminder/intellij.vcs.changeReminder.iml
+++ b/plugins/changeReminder/intellij.vcs.changeReminder.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.log.graph.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.vcs.git" />
    <orderEntry type="module-library">
      <library name="change-reminder-prediction-model" type="repository">
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -82,6 +82,7 @@
    <orderEntry type="library" name="kotlinx-serialization-protobuf" level="project" />
    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.ijent.community.buildConstants" />
    <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
    <orderEntry type="library" name="snakeyaml" level="project" />
--- a/plugins/devkit/devkit-core/src/actions/ToggleHighlightingMarkupAction.java
+++ b/plugins/devkit/devkit-core/src/actions/ToggleHighlightingMarkupAction.java
@@ -28,10 +28,7 @@ import java.util.LinkedList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-/**
- * @author gregsh
- */
-public class ToggleHighlightingMarkupAction extends DumbAwareAction {
+final class ToggleHighlightingMarkupAction extends DumbAwareAction {
  @Override
  public void update(@NotNull AnActionEvent e) {
    Editor editor = e.getData(CommonDataKeys.EDITOR);
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -52,6 +52,7 @@
    <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
    <orderEntry type="library" name="kotlinx-datetime-jvm" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.lvcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.tips" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic" />
--- a/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
+++ b/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
@@ -29,6 +29,7 @@
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" name="Guava" level="project" />
    <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.core" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralReplaceHandler.kt
+++ b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralReplaceHandler.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.kotlin.idea.k2.codeinsight.structuralsearch

 import com.intellij.openapi.application.ModalityState
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.psi.typeRefHelpers.setReceiverTypeReference
 import java.util.concurrent.Callable

-class KotlinStructuralReplaceHandler(private val project: Project) : StructuralReplaceHandler() {
+internal class KotlinStructuralReplaceHandler(private val project: Project) : StructuralReplaceHandler() {
    override fun replace(info: ReplacementInfo, options: ReplaceOptions) {
        val searchTemplate = StructuralSearchUtil.getPresentableElement(
            PatternCompiler.compilePattern(project, options.matchOptions, true, true).let { it.targetNode ?: it.nodes.current() })
--- a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralSearchProfile.kt
+++ b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralSearchProfile.kt
@@ -364,8 +364,9 @@ class KotlinStructuralSearchProfile : StructuralSearchProfile() {
        return searchElements[0] is KtDeclaration
    }

-    override fun getReplaceHandler(project: Project, replaceOptions: ReplaceOptions): KotlinStructuralReplaceHandler =
-        KotlinStructuralReplaceHandler(project)
+    override fun getReplaceHandler(project: Project, replaceOptions: ReplaceOptions): StructuralReplaceHandler {
+        return KotlinStructuralReplaceHandler(project)
+    }

    override fun getPatternContexts(): MutableList<PatternContext> = PATTERN_CONTEXTS

--- a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/predicates/KotlinExprTypePredicate.kt
+++ b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/predicates/KotlinExprTypePredicate.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.kotlin.idea.k2.codeinsight.structuralsearch.predicates

 import com.intellij.psi.PsiElement
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.isNull

-class KotlinExprTypePredicate(
+internal class KotlinExprTypePredicate(
    private val search: String,
    private val withinHierarchy: Boolean,
    private val ignoreCase: Boolean,
--- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
+++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
@@ -41,6 +41,7 @@
    <orderEntry type="module" module-name="intellij.java.debugger" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.scripting" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.code-insight.impl-base" />
    <orderEntry type="module" module-name="kotlin.code-insight.override-implement.shared" />
--- a/plugins/kotlin/onboarding/kotlin.onboarding.iml
+++ b/plugins/kotlin/onboarding/kotlin.onboarding.iml
@@ -33,6 +33,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.statsCollector" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
--- a/plugins/kotlin/preferences/kotlin.preferences.iml
+++ b/plugins/kotlin/preferences/kotlin.preferences.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="swingx" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.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.plugin" />
--- a/plugins/markdown/test/intellij.markdown.tests.iml
+++ b/plugins/markdown/test/intellij.markdown.tests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.markdown.frontmatter" />
    <orderEntry type="module" module-name="intellij.markdown.frontmatter.toml" />
    <orderEntry type="module" module-name="intellij.markdown.frontmatter.yaml" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.markdown.images" />
    <orderEntry type="module" module-name="intellij.markdown.model" />
    <orderEntry type="module" module-name="intellij.markdown.spellchecker" />
--- 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
@@ -15,6 +15,7 @@
    <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.editor.ex" />
    <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.core.ui" />
--- a/plugins/repository-search/intellij.repository.search.iml
+++ b/plugins/repository-search/intellij.repository.search.iml
@@ -33,6 +33,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
--- a/plugins/restructuredtext/intellij.restructuredtext.iml
+++ b/plugins/restructuredtext/intellij.restructuredtext.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="PROVIDED" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" scope="PROVIDED" />
--- a/plugins/settings-repository/intellij.settingsRepository.iml
+++ b/plugins/settings-repository/intellij.settingsRepository.iml
@@ -60,6 +60,7 @@
    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.credentialStore.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="library" name="jackson" level="project" />
    <orderEntry type="library" name="jackson-databind" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/plugins/settings-repository/intellij.settingsRepository.tests.iml
+++ b/plugins/settings-repository/intellij.settingsRepository.tests.iml
@@ -15,6 +15,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="jna" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
--- a/plugins/settings-sync/intellij.settingsSync.iml
+++ b/plugins/settings-sync/intellij.settingsSync.iml
@@ -55,6 +55,7 @@
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
    <orderEntry type="module" module-name="intellij.performanceTesting" />
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
--- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt
+++ b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt
@@ -3,10 +3,12 @@ package com.intellij.settingsSync
 import com.intellij.configurationStore.getPerOsSettingsStorageFolderName
 import com.intellij.configurationStore.schemeManager.SchemeManagerFactoryBase
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.*
+import com.intellij.openapi.components.ComponentCategorizer
+import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.SettingsCategory
+import com.intellij.openapi.components.State
 import com.intellij.openapi.editor.colors.impl.AppEditorFontOptions
 import com.intellij.openapi.options.SchemeManagerFactory
-import com.intellij.openapi.util.text.StringUtil
 import com.intellij.serviceContainer.ComponentManagerImpl
 import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID
 import java.util.concurrent.ConcurrentHashMap
@@ -30,18 +32,18 @@ internal fun isSyncCategoryEnabled(fileSpec: String): Boolean {

 private fun removeOsPrefix(fileSpec: String): String {
  val osPrefix = getPerOsSettingsStorageFolderName() + "/"
-  return if (fileSpec.startsWith(osPrefix)) StringUtil.trimStart(fileSpec, osPrefix) else fileSpec
+  return if (fileSpec.startsWith(osPrefix)) fileSpec.removePrefix(osPrefix) else fileSpec
 }

 private fun getRoamableCategory(fileName: String, componentClasses: List<Class<PersistentStateComponent<Any>>>): Pair<SettingsCategory, String?> {
-  componentClasses.forEach {
-    val category = ComponentCategorizer.getCategory(it)
-    if (category == SettingsCategory.OTHER) return@forEach
+  for (componentClass in componentClasses) {
+    val category = ComponentCategorizer.getCategory(componentClass)
+    if (category == SettingsCategory.OTHER) continue

-    val state = it.getAnnotation(State::class.java)
+    val state = componentClass.getAnnotation(State::class.java)
    val storage = state.storages.find { it.value == fileName }
    if (storage == null || !storage.roamingType.isRoamable) {
-      return@forEach
+      continue
    }

    // Once found, ignore any other possibly conflicting definitions
@@ -87,7 +89,7 @@ private fun getSchemeCategory(fileSpec: String): Pair<SettingsCategory, String?>
    return null
  }

-  return settingsCategory!! to null
+  return settingsCategory to null
 }


--- a/plugins/svn4idea/intellij.vcs.svn.tests.iml
+++ b/plugins/svn4idea/intellij.vcs.svn.tests.iml
@@ -15,6 +15,7 @@
    <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.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.vcs.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -40,6 +40,7 @@
    <orderEntry type="module" module-name="intellij.platform.indexing.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.editor.ex" />
    <orderEntry type="library" name="jackson" level="project" />
    <orderEntry type="library" name="jackson-databind" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/python/intellij.python.community.tests.iml
+++ b/python/intellij.python.community.tests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.debugger" scope="TEST" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.python.pydev" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
--- a/uast/uast-common-ide/intellij.platform.uast.ide.iml
+++ b/uast/uast-common-ide/intellij.platform.uast.ide.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.uast" />
--- a/uast/uast-common-ide/src/com/intellij/psi/UastReferenceByUsageAdapter.kt
+++ b/uast/uast-common-ide/src/com/intellij/psi/UastReferenceByUsageAdapter.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.psi

 import com.intellij.codeInsight.completion.CompletionUtilCoreImpl
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.*
 import org.jetbrains.uast.expressions.UInjectionHost

-class UastReferenceByUsageAdapter(
+internal class UastReferenceByUsageAdapter(
  val expressionPattern: ElementPattern<out UElement>,
  val usagePattern: ElementPattern<out UElement>,
  val provider: UastReferenceProvider