IJPL-233558 IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 refactor(platform): split welcome-screen api to break platform-api cycle (part 3)

GitOrigin-RevId: f451593c7968b1c10e83fe664b9cbad12f7104be
2026-03-22 15:19:59 +07:00 · 2026-02-11 09:45:33 +01:00
parent e7120e5e7a
commit c0807ece50
43 changed files with 85 additions and 41 deletions
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1412,8 +1412,8 @@
      <module fileurl="file://$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.tests.iml" filepath="$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.tests.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/warmup/intellij.platform.warmup.iml" filepath="$PROJECT_DIR$/platform/warmup/intellij.platform.warmup.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/warmup/performanceTesting/intellij.platform.warmup.performanceTesting.iml" filepath="$PROJECT_DIR$/platform/warmup/performanceTesting/intellij.platform.warmup.performanceTesting.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/welcome-screen/intellij.platform.welcomeScreen.impl.iml" filepath="$PROJECT_DIR$/platform/welcome-screen/intellij.platform.welcomeScreen.impl.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/welcome-screen-api/intellij.platform.welcomeScreen.iml" filepath="$PROJECT_DIR$/platform/welcome-screen-api/intellij.platform.welcomeScreen.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/welcome-screen/intellij.platform.welcomeScreen.iml" filepath="$PROJECT_DIR$/platform/welcome-screen/intellij.platform.welcomeScreen.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/welcome-screen-impl/intellij.platform.welcomeScreen.impl.iml" filepath="$PROJECT_DIR$/platform/welcome-screen-impl/intellij.platform.welcomeScreen.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/whatsNew/intellij.platform.whatsNew.iml" filepath="$PROJECT_DIR$/platform/whatsNew/intellij.platform.whatsNew.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/workspace/jps/intellij.platform.workspace.jps.iml" filepath="$PROJECT_DIR$/platform/workspace/jps/intellij.platform.workspace.jps.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml" filepath="$PROJECT_DIR$/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml" />
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -854,7 +854,7 @@ platform/vcs-tests
 platform/warmup
 platform/warmup/performanceTesting
 platform/welcome-screen
-platform/welcome-screen-api
+platform/welcome-screen-impl
 platform/whatsNew
 platform/workspace/jps
 platform/workspace/jps/tests
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt
@@ -251,6 +251,7 @@ object CoreModuleSets {
    embeddedModule("intellij.platform.core.impl")
    embeddedModule("intellij.platform.projectFrame")
    embeddedModule("intellij.platform.welcomeScreen")
+    embeddedModule("intellij.platform.welcomeScreen.impl")

    embeddedModule("intellij.platform.projectModel")
    embeddedModule("intellij.platform.projectModel.impl")
--- a/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml
+++ b/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml
@@ -116,6 +116,7 @@
    <module name="intellij.platform.core.impl" loading="embedded"/>
    <module name="intellij.platform.projectFrame" loading="embedded"/>
    <module name="intellij.platform.welcomeScreen" loading="embedded"/>
+    <module name="intellij.platform.welcomeScreen.impl" loading="embedded"/>
    <module name="intellij.platform.projectModel" loading="embedded"/>
    <module name="intellij.platform.projectModel.impl" loading="embedded"/>
    <module name="intellij.platform.analysis" loading="embedded"/>
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -36,7 +36,7 @@ jvm_library(
    "//libraries/oro-matcher",
    "//libraries/velocity",
    "//platform/platform-impl:ide-impl",
-    "//platform/welcome-screen:welcomeScreen-impl",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//platform/lang-core",
    "//platform/lvcs-api:lvcs",
    "//platform/macro",
@@ -136,7 +136,6 @@ jvm_library(
    "//platform/forms_rt:java-guiForms-rt",
  ],
  exports = [
-    "//platform/welcome-screen:welcomeScreen-impl",
    "//platform/analysis-impl",
    "//platform/util",
  ]
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -44,7 +44,7 @@
    <orderEntry type="module" module-name="intellij.libraries.oro.matcher" />
    <orderEntry type="module" module-name="intellij.libraries.velocity" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.core" />
    <orderEntry type="module" module-name="intellij.platform.lvcs" />
    <orderEntry type="module" module-name="intellij.platform.macro" />
--- a/platform/lang-impl/resources/intellij.platform.lang.impl.xml
+++ b/platform/lang-impl/resources/intellij.platform.lang.impl.xml
@@ -45,6 +45,7 @@
    <module name="intellij.platform.lang.core"/>
    <module name="intellij.platform.projectModel"/>
    <module name="intellij.platform.projectModel.impl"/>
+    <module name="intellij.platform.welcomeScreen.impl"/>
  </dependencies>
  <!-- endregion -->

--- a/platform/platform-api/BUILD.bazel
+++ b/platform/platform-api/BUILD.bazel
@@ -51,7 +51,7 @@ jvm_library(
    "//platform/remote-core",
    "//platform/ide-core",
    "//platform/project-frame",
-    "//platform/welcome-screen-api:welcomeScreen",
+    "//platform/welcome-screen",
    "//platform/util/text-matching",
    "//platform/diagnostic",
    "//libraries/jackson/jackson",
@@ -67,7 +67,7 @@ jvm_library(
    "//platform/util:util-ui",
    "//platform/ide-core",
    "//platform/project-frame",
-    "//platform/welcome-screen-api:welcomeScreen",
+    "//platform/welcome-screen",
    "//platform/progress/shared:ide-progress",
  ]
 )
--- a/platform/platform-impl/BUILD.bazel
+++ b/platform/platform-impl/BUILD.bazel
@@ -39,7 +39,7 @@ jvm_library(
    "//platform/credential-store",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-api:ide",
-    "//platform/welcome-screen:welcomeScreen-impl",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//libraries/oro-matcher",
    "//jps/model-api:model",
    "//jps/model-serialization",
@@ -162,7 +162,6 @@ jvm_library(
  ],
  exports = [
    "//platform/platform-api:ide",
-    "//platform/welcome-screen:welcomeScreen-impl",
    "@lib//:kotlin-stdlib",
    "//platform/util:util-ui",
  ],
@@ -203,7 +202,7 @@ jvm_library(
    "//platform/credential-store",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-api:ide",
-    "//platform/welcome-screen:welcomeScreen-impl",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//libraries/oro-matcher",
    "//jps/model-api:model",
    "//jps/model-serialization",
@@ -335,7 +334,6 @@ jvm_library(
  ],
  exports = [
    "//platform/platform-api:ide",
-    "//platform/welcome-screen:welcomeScreen-impl",
    "@lib//:kotlin-stdlib",
    "//platform/util:util-ui",
  ]
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -38,7 +38,7 @@
    <orderEntry type="module" module-name="intellij.platform.credentialStore" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" />
    <orderEntry type="module" module-name="intellij.libraries.oro.matcher" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
--- a/platform/platform-impl/resources/intellij.platform.ide.impl.xml
+++ b/platform/platform-impl/resources/intellij.platform.ide.impl.xml
@@ -61,6 +61,7 @@
    <module name="intellij.platform.projectModel.impl"/>
    <module name="intellij.platform.util.ex"/>
    <module name="intellij.platform.util.ui"/>
+    <module name="intellij.platform.welcomeScreen.impl"/>
  </dependencies>
  <!-- endregion -->
  <extensions defaultExtensionNs="com.intellij">
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/EmptyStateProjectsPanel.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/EmptyStateProjectsPanel.kt
@@ -30,12 +30,11 @@ import com.intellij.ui.scale.JBUIScale.scale
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import com.intellij.util.ui.FocusUtil
 import com.intellij.util.ui.JBUI
-import org.jetbrains.annotations.ApiStatus
+import org.jetbrains.annotations.ApiStatus.Internal
 import java.awt.Font
 import java.util.concurrent.ConcurrentHashMap
 import javax.swing.JComponent

-
@RequiresEdt
 internal fun emptyStateProjectPanel(disposable: Disposable): JComponent = panel {
  row {
@@ -79,9 +78,8 @@ internal fun emptyStateProjectPanel(disposable: Disposable): JComponent = panel
  background = WelcomeScreenUIManager.getMainAssociatedComponentBackground()
 }

-
 // Returns main actions, more actions
-@ApiStatus.Internal
+@Internal
 fun createActionToolbars(parentDisposable: Disposable): Pair<ActionToolbarImpl, ActionToolbarImpl> {
  val actionManager = ActionManager.getInstance()
  val baseGroup = actionManager.getAction(IdeActions.GROUP_WELCOME_SCREEN_QUICKSTART_EMPTY_STATE) as ActionGroup
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/ProjectsTabFactory.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/ProjectsTabFactory.kt
@@ -64,7 +64,6 @@ import javax.swing.JComponent
 import javax.swing.JPanel
 import javax.swing.ScrollPaneConstants

-
@Suppress("OVERRIDE_DEPRECATION")
 internal class ProjectsTabFactory : WelcomeTabFactory {
  override fun createWelcomeTab(parentDisposable: Disposable): WelcomeScreenTab = ProjectsTab(parentDisposable)
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml
@@ -117,6 +117,7 @@
    <module name="intellij.platform.core.impl" loading="embedded"/>
    <module name="intellij.platform.projectFrame" loading="embedded"/>
    <module name="intellij.platform.welcomeScreen" loading="embedded"/>
+    <module name="intellij.platform.welcomeScreen.impl" loading="embedded"/>
    <module name="intellij.platform.projectModel" loading="embedded"/>
    <module name="intellij.platform.projectModel.impl" loading="embedded"/>
    <module name="intellij.platform.analysis" loading="embedded"/>
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml
@@ -118,6 +118,7 @@
    <module name="intellij.platform.core.impl" loading="embedded"/>
    <module name="intellij.platform.projectFrame" loading="embedded"/>
    <module name="intellij.platform.welcomeScreen" loading="embedded"/>
+    <module name="intellij.platform.welcomeScreen.impl" loading="embedded"/>
    <module name="intellij.platform.projectModel" loading="embedded"/>
    <module name="intellij.platform.projectModel.impl" loading="embedded"/>
    <module name="intellij.platform.analysis" loading="embedded"/>
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml
@@ -119,6 +119,7 @@
    <module name="intellij.platform.core.impl" loading="embedded"/>
    <module name="intellij.platform.projectFrame" loading="embedded"/>
    <module name="intellij.platform.welcomeScreen" loading="embedded"/>
+    <module name="intellij.platform.welcomeScreen.impl" loading="embedded"/>
    <module name="intellij.platform.projectModel" loading="embedded"/>
    <module name="intellij.platform.projectModel.impl" loading="embedded"/>
    <module name="intellij.platform.analysis" loading="embedded"/>
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml
@@ -120,6 +120,7 @@
    <module name="intellij.platform.core.impl" loading="embedded"/>
    <module name="intellij.platform.projectFrame" loading="embedded"/>
    <module name="intellij.platform.welcomeScreen" loading="embedded"/>
+    <module name="intellij.platform.welcomeScreen.impl" loading="embedded"/>
    <module name="intellij.platform.projectModel" loading="embedded"/>
    <module name="intellij.platform.projectModel.impl" loading="embedded"/>
    <module name="intellij.platform.analysis" loading="embedded"/>
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
@@ -123,6 +123,7 @@
    <module name="intellij.platform.core.impl" loading="embedded"/>
    <module name="intellij.platform.projectFrame" loading="embedded"/>
    <module name="intellij.platform.welcomeScreen" loading="embedded"/>
+    <module name="intellij.platform.welcomeScreen.impl" loading="embedded"/>
    <module name="intellij.platform.projectModel" loading="embedded"/>
    <module name="intellij.platform.projectModel.impl" loading="embedded"/>
    <module name="intellij.platform.analysis" loading="embedded"/>
--- a/platform/platform-resources/src/META-INF/PlatformLangComponents.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangComponents.xml
@@ -5,8 +5,6 @@
    <!--suppress PluginXmlDynamicPlugin -->
    <extensionPoint name="registerToolWindowTaskProvider" interface="com.intellij.toolWindow.RegisterToolWindowTaskProvider"/>
    <extensionPoint qualifiedName="com.intellij.diagnostic.freezeNotifier" interface="com.intellij.diagnostic.FreezeNotifier"/>
-    <extensionPoint name="noProjectStateHandler" interface="com.intellij.openapi.wm.ex.NoProjectStateHandler"/>
-    <extensionPoint name="welcomeScreenProjectProvider" interface="com.intellij.openapi.wm.ex.WelcomeScreenProjectProvider"/>
  </extensionPoints>

  <extensions defaultExtensionNs="com.intellij">
@@ -219,8 +217,6 @@
    <applicationService serviceInterface="com.intellij.openapi.wm.ex.WelcomeScreenProjectSupport"
                        serviceImplementation="com.intellij.openapi.wm.ex.WelcomeScreenProjectSupportImpl"/>

-    <projectFrameCapabilitiesProvider implementation="com.intellij.openapi.wm.ex.WelcomeScreenProjectFrameCapabilitiesProvider"/>
-
    <!--XNext-->
    <applicationService serviceInterface="com.intellij.openapi.application.impl.InternalUICustomization"
                        serviceImplementation="com.intellij.openapi.application.impl.islands.IslandsUICustomization"/>
--- a/platform/remoteDev-util/BUILD.bazel
+++ b/platform/remoteDev-util/BUILD.bazel
@@ -50,6 +50,7 @@ jvm_library(
    "//platform/diagnostic",
    "//platform/bootstrap",
    "//platform/platform-impl/ui",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//platform/lang-core",
    "//platform/runtime/repository",
    "//platform/core-impl",
@@ -108,6 +109,7 @@ jvm_library(
    "//platform/diagnostic",
    "//platform/bootstrap",
    "//platform/platform-impl/ui",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//platform/lang-core",
    "//platform/runtime/repository",
    "//platform/core-impl",
--- a/platform/remoteDev-util/intellij.remoteDev.util.iml
+++ b/platform/remoteDev-util/intellij.remoteDev.util.iml
@@ -71,6 +71,7 @@
    <orderEntry type="module" module-name="intellij.platform.diagnostic" />
    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
    <orderEntry type="module" module-name="intellij.platform.ide.ui" />
+    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" />
    <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" />
--- a/platform/welcome-screen-impl/BUILD.bazel
+++ b/platform/welcome-screen-impl/BUILD.bazel
@@ -22,7 +22,7 @@ jvm_library(
    "//platform/ide-core",
    "//platform/projectModel-api:projectModel",
    "//platform/project-frame",
-    "//platform/welcome-screen-api:welcomeScreen",
+    "//platform/welcome-screen",
    "//platform/util",
    "//platform/util:util-ui",
  ]
--- a/platform/welcome-screen-impl/intellij.platform.welcomeScreen.impl.iml
+++ b/platform/welcome-screen-impl/intellij.platform.welcomeScreen.impl.iml
@@ -2,9 +2,9 @@
 <module type="JAVA_MODULE" version="4">
  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />
-    <content url="file://$MODULE_DIR$/../welcome-screen-impl">
-      <sourceFolder url="file://$MODULE_DIR$/../welcome-screen-impl/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../welcome-screen-impl/src" isTestSource="false" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/platform/welcome-screen-impl/module-content.yaml
+++ b/platform/welcome-screen-impl/module-content.yaml
@@ -1,3 +1,3 @@
- name: dist.all/lib/intellij.platform.welcomeScreen.jar
+- name: dist.all/lib/intellij.platform.welcomeScreen.impl.jar
  modules:
-  - name: intellij.platform.welcomeScreen
+  - name: intellij.platform.welcomeScreen.impl
--- a/platform/welcome-screen-impl/resources/intellij.platform.welcomeScreen.impl.xml
+++ b/platform/welcome-screen-impl/resources/intellij.platform.welcomeScreen.impl.xml
@@ -7,7 +7,11 @@
    <module name="intellij.platform.projectFrame"/>
    <module name="intellij.platform.projectModel"/>
    <module name="intellij.platform.util.ui"/>
+    <module name="intellij.platform.welcomeScreen"/>
  </dependencies>
  <!-- endregion -->

+  <extensions defaultExtensionNs="com.intellij">
+    <projectFrameCapabilitiesProvider implementation="com.intellij.platform.welcomeScreen.WelcomeScreenProjectFrameCapabilitiesProvider"/>
+  </extensions>
 </idea-plugin>
--- a/platform/welcome-screen-impl/src/com/intellij/platform/welcomeScreen/WelcomeScreenProjectFrameCapabilitiesProvider.kt
+++ b/platform/welcome-screen-impl/src/com/intellij/platform/welcomeScreen/WelcomeScreenProjectFrameCapabilitiesProvider.kt
@@ -1,7 +1,11 @@
 // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.openapi.wm.ex
+package com.intellij.platform.welcomeScreen

 import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ex.ProjectFrameCapabilitiesProvider
+import com.intellij.openapi.wm.ex.ProjectFrameCapability
+import com.intellij.openapi.wm.ex.ProjectFrameUiPolicy
+import com.intellij.openapi.wm.ex.WelcomeScreenProjectProvider
 import java.util.EnumSet

 internal class WelcomeScreenProjectFrameCapabilitiesProvider : ProjectFrameCapabilitiesProvider {
@@ -12,11 +16,11 @@ internal class WelcomeScreenProjectFrameCapabilitiesProvider : ProjectFrameCapab
   * providers that consume [ProjectFrameCapability.WELCOME_EXPERIENCE].
   */
  override fun getCapabilities(project: Project): Set<ProjectFrameCapability> {
-    if (!WelcomeScreenProjectProvider.isWelcomeScreenProject(project)) {
+    if (!WelcomeScreenProjectProvider.Companion.isWelcomeScreenProject(project)) {
      return emptySet()
    }

-    if (WelcomeScreenProjectProvider.isForceDisabledFileColors()) {
+    if (WelcomeScreenProjectProvider.Companion.isForceDisabledFileColors()) {
      return WELCOME_CAPABILITIES_WITH_DISABLED_FILE_COLORS
    }
    else {
--- a/platform/welcome-screen-api/BUILD.bazel
+++ b/platform/welcome-screen-api/BUILD.bazel
@@ -1,11 +1,18 @@
 ### auto-generated section `build intellij.platform.welcomeScreen` start
-load("@rules_jvm//:jvm.bzl", "jvm_library")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "welcome-screen_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)

 jvm_library(
-  name = "welcomeScreen",
+  name = "welcome-screen",
  module_name = "intellij.platform.welcomeScreen",
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
+  resources = [":welcome-screen_resources"],
  deps = [
    "@lib//:kotlin-stdlib",
    "//platform/core-api:core",
--- a/platform/welcome-screen/api-dump.txt
+++ b/platform/welcome-screen/api-dump.txt
--- a/platform/welcome-screen-api/intellij.platform.welcomeScreen.iml
+++ b/platform/welcome-screen-api/intellij.platform.welcomeScreen.iml
@@ -3,6 +3,7 @@
  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
    <orderEntry type="inheritedJdk" />
--- a/platform/welcome-screen/module-content.yaml
+++ b/platform/welcome-screen/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/intellij.platform.welcomeScreen.jar
+  modules:
+  - name: intellij.platform.welcomeScreen
--- a/platform/welcome-screen/resources/intellij.platform.welcomeScreen.xml
+++ b/platform/welcome-screen/resources/intellij.platform.welcomeScreen.xml
@@ -0,0 +1,16 @@
+<!--suppress PluginXmlDynamicPlugin -->
+<idea-plugin>
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+  <dependencies>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.ide.core"/>
+    <module name="intellij.platform.projectFrame"/>
+    <module name="intellij.platform.projectModel"/>
+  </dependencies>
+  <!-- endregion -->
+
+  <extensionPoints>
+    <extensionPoint name="welcomeScreenProjectProvider" interface="com.intellij.openapi.wm.ex.WelcomeScreenProjectProvider"/>
+    <extensionPoint name="noProjectStateHandler" interface="com.intellij.openapi.wm.ex.NoProjectStateHandler"/>
+  </extensionPoints>
+</idea-plugin>
--- a/platform/welcome-screen-api/src/com/intellij/openapi/wm/ex/NoProjectStateHandler.kt
+++ b/platform/welcome-screen-api/src/com/intellij/openapi/wm/ex/NoProjectStateHandler.kt
@@ -9,7 +9,7 @@ private val EP_NAME: ExtensionPointName<NoProjectStateHandler> = ExtensionPointN

@Internal
 fun findNoProjectStateHandler(): (suspend () -> Project?)? {
-  return EP_NAME.extensionList.firstNotNullOfOrNull { it.createHandler() }
+  return EP_NAME.extensionsIfPointIsRegistered.firstNotNullOfOrNull { it.createHandler() }
 }

@Internal
--- a/platform/welcome-screen-api/src/com/intellij/openapi/wm/ex/WelcomeScreenProjectProvider.kt
+++ b/platform/welcome-screen-api/src/com/intellij/openapi/wm/ex/WelcomeScreenProjectProvider.kt
@@ -25,7 +25,7 @@ private var cachedProjectsBasePath: String? = null

@Internal
 fun getWelcomeScreenProjectProvider(): WelcomeScreenProjectProvider? {
-  val providers = EP_NAME.extensionList
+  val providers = EP_NAME.extensionsIfPointIsRegistered
  if (providers.isEmpty()) {
    return null
  }
--- a/platform/welcome-screen-api/src/com/intellij/openapi/wm/ex/WelcomeScreenTabService.kt
+++ b/platform/welcome-screen-api/src/com/intellij/openapi/wm/ex/WelcomeScreenTabService.kt
@@ -2,7 +2,7 @@
 package com.intellij.openapi.wm.ex

 import com.intellij.openapi.project.Project
-import org.jetbrains.annotations.ApiStatus
+import org.jetbrains.annotations.ApiStatus.Internal

 /**
 * Opens a welcome-screen tab alongside regular editor tabs during startup.
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus
 * Implementations run earlier than [com.intellij.openapi.startup.ProjectActivity], which is too
 * late for this initialization stage.
 */
-@ApiStatus.Internal
+@Internal
 interface WelcomeScreenTabService {
  /**
   * Opens a welcome tab for the current project when applicable.
--- a/plugins/eclipse/BUILD.bazel
+++ b/plugins/eclipse/BUILD.bazel
@@ -43,6 +43,7 @@ jvm_library(
    "//xml/xml-psi-impl:psi-impl",
    "//platform/execution",
    "//platform/forms_rt:java-guiForms-rt",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
  ]
 )

@@ -93,6 +94,7 @@ jvm_library(
    "//xml/xml-psi-impl:psi-impl",
    "//platform/execution",
    "//platform/forms_rt:java-guiForms-rt",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
  ]
 )
 ### auto-generated section `build intellij.eclipse` end
--- a/plugins/eclipse/intellij.eclipse.iml
+++ b/plugins/eclipse/intellij.eclipse.iml
@@ -47,5 +47,6 @@
    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
    <orderEntry type="module" module-name="intellij.platform.execution" />
    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" />
  </component>
 </module>
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/detect/EclipseProjectDetector.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/detect/EclipseProjectDetector.java
@@ -18,7 +18,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.concurrency.AppJavaExecutorUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jdom.Element;
-import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
@@ -37,7 +37,7 @@ import java.util.Objects;
 import java.util.Properties;
 import java.util.function.Consumer;

-@ApiStatus.Internal
+@Internal
 public final class EclipseProjectDetector extends ProjectDetector {
  private static final Logger LOG = Logger.getInstance(EclipseProjectDetector.class);

--- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/detect/EclipseProjectDetectorTest.java
+++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/detect/EclipseProjectDetectorTest.java
@@ -8,7 +8,6 @@ import java.io.IOException;
 import java.util.List;

 public class EclipseProjectDetectorTest {
-
  @Test
  public void testWorkspaces() throws IOException {
    String[] workspaces = EclipseProjectDetector.getWorkspaces(
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -205,6 +205,7 @@ jvm_library(
    "//platform/indexing-api:indexing",
    "//jps/model-api:model",
    "//platform/lang-core",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//platform/lang-api:lang",
    "//platform/macro",
    "//platform/projectModel-api:projectModel",
--- a/python/ide/impl/BUILD.bazel
+++ b/python/ide/impl/BUILD.bazel
@@ -26,6 +26,7 @@ jvm_library(
    "//platform/core-api:core",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//platform/indexing-api:indexing",
    "//jps/model-api:model",
    "//platform/lang-core",
@@ -94,6 +95,7 @@ jvm_library(
    "//platform/core-api:core",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
+    "//platform/welcome-screen-impl:welcomeScreen-impl",
    "//platform/indexing-api:indexing",
    "//jps/model-api:model",
    "//platform/lang-core",
--- a/python/ide/impl/intellij.pycharm.community.ide.impl.iml
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.iml
@@ -37,6 +37,7 @@
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.lang.core" />
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -44,6 +44,7 @@
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.lang.core" />
+    <orderEntry type="module" module-name="intellij.platform.welcomeScreen.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.macro" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
--- a/python/src/com/jetbrains/python/newProjectWizard/collector/PyProjectTypeValidationRule.kt
+++ b/python/src/com/jetbrains/python/newProjectWizard/collector/PyProjectTypeValidationRule.kt
@@ -18,7 +18,7 @@ class PyProjectTypeValidationRule : CustomValidationRule() {
    /**
     * [com.intellij.platform.DirectoryProjectGenerator] for default (empty, base) project type isn't registered in EP, hence hardcoded
     */
-    const val EMPTY_PROJECT_TYPE_ID = "com.intellij.pycharm.community.ide.impl.newProject.steps.PythonBaseProjectGenerator"
+    const val EMPTY_PROJECT_TYPE_ID: String = "com.intellij.pycharm.community.ide.impl.newProject.steps.PythonBaseProjectGenerator"
  }

  override fun getRuleId(): String = "python_new_project_type"