IJPL-245430 fix pluginized module dependencies

Move bookmarks-related platform modules behind an explicit bundled plugin wrapper and split debugger and JetBrains Client bookmark pieces into content modules. This lets products include bookmarks through normal plugin wiring instead of keeping the modules embedded in broad module sets.

Update generated product layouts, module descriptors, and packaging snapshots so the new wrapper is present where products and remote development clients need it.

IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957 IJ-MR-199124 IJ-MR-197441 IJ-MR-204135 IJ-MR-204674

GitOrigin-RevId: e51549c55232531961957702572ce184d03ec277

.idea/modules.xml

@@ -1250,6 +1250,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/bookmarks/intellij.platform.bookmarks.iml" filepath="$PROJECT_DIR$/platform/bookmarks/intellij.platform.bookmarks.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml" filepath="$PROJECT_DIR$/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/bookmarks/frontend/intellij.platform.bookmarks.frontend.iml" filepath="$PROJECT_DIR$/platform/bookmarks/frontend/intellij.platform.bookmarks.frontend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/bookmarks/plugin/intellij.platform.bookmarks.plugin.iml" filepath="$PROJECT_DIR$/platform/bookmarks/plugin/intellij.platform.bookmarks.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" filepath="$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/intellij.platform.bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/intellij.platform.bootstrap.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/coroutine/intellij.platform.bootstrap.coroutine.iml" filepath="$PROJECT_DIR$/platform/bootstrap/coroutine/intellij.platform.bootstrap.coroutine.iml" />
@@ -1312,6 +1313,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/intellij.platform.debugger.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/intellij.platform.debugger.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/intellij.platform.debugger.impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/intellij.platform.debugger.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/bookmarks/intellij.platform.debugger.impl.bookmarks.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/bookmarks/intellij.platform.debugger.impl.bookmarks.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.tests.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml" />

build/bazel-generated-file-list.txt

@@ -553,6 +553,7 @@ platform/bazel-runfiles
 platform/bookmarks
 platform/bookmarks/backend
 platform/bookmarks/frontend
+platform/bookmarks/plugin
 platform/boot
 platform/bootstrap
 platform/bootstrap/coroutine
@@ -930,6 +931,7 @@ platform/wsl-impl
 platform/xdebugger-api
 platform/xdebugger-impl
 platform/xdebugger-impl/backend
+platform/xdebugger-impl/bookmarks
 platform/xdebugger-impl/frontend
 platform/xdebugger-impl/rpc
 platform/xdebugger-impl/shared

java/java-impl/resources/intellij.java.impl.xml

@@ -26,6 +26,7 @@
     <module name="intellij.java.structureView"/>
     <module name="intellij.jsp"/>
     <module name="intellij.jsp.spi"/>
+    <module name="intellij.platform.bookmarks"/>
     <module name="intellij.platform.structureView.impl"/>
     <module name="intellij.platform.todo"/>
     <module name="intellij.spellchecker"/>

module-set-plugins/generated/intellij.moduleSet.plugin.main/BUILD.bazel

@@ -39,6 +39,7 @@ jvm_library(
     "//platform/vcs-impl/frontend",
     "//platform/vcs-impl/lang/todo",
     "//platform/navbar/plugin",
+    "//platform/bookmarks/plugin",
   ]
 )
 
@@ -82,6 +83,7 @@ jvm_library(
     "//platform/vcs-impl/frontend:frontend_test_lib",
     "//platform/vcs-impl/lang/todo:todo_test_lib",
     "//platform/navbar/plugin:plugin_test_lib",
+    "//platform/bookmarks/plugin:plugin_test_lib",
   ]
 )
 ### auto-generated section `build intellij.moduleSet.plugin.main` end

module-set-plugins/generated/intellij.moduleSet.plugin.main/intellij.moduleSet.plugin.main.iml

@@ -36,5 +36,6 @@
     <orderEntry type="module" module-name="intellij.platform.vcs.impl.frontend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl.lang.todo" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.navbar.plugin" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.bookmarks.plugin" scope="RUNTIME" />
   </component>
 </module>

platform/bookmarks/plugin/BUILD.bazel

@@ -0,0 +1,27 @@
+### auto-generated section `build intellij.platform.bookmarks.plugin` start
+load("@rules_jvm//:jvm.bzl", "jvm_library")
+
+jvm_library(
+  name = "plugin",
+  module_name = "intellij.platform.bookmarks.plugin",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = glob(["resources/**/*"]),
+  resource_strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "plugin_test_lib",
+  testonly = True,
+  module_name = "intellij.platform.bookmarks.plugin",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  runtime_deps = [":plugin"]
+)
+### auto-generated section `build intellij.platform.bookmarks.plugin` end
+
+### auto-generated section `iml intellij.platform.bookmarks.plugin` start
+exports_files([
+  "intellij.platform.bookmarks.plugin.iml",
+], visibility = ["//visibility:public"])
+### auto-generated section `iml intellij.platform.bookmarks.plugin` end

platform/bookmarks/plugin/intellij.platform.bookmarks.plugin.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

platform/bookmarks/plugin/plugin-content.yaml

@@ -0,0 +1,11 @@
+- name: lib/modules/intellij.platform.bookmarks.jar
+  contentModules:
+  - name: intellij.platform.bookmarks
+- name: lib/platform-bookmarks-plugin.jar
+  modules:
+  - name: intellij.platform.bookmarks.plugin
+  contentModules:
+  - name: intellij.platform.bookmarks.backend
+  - name: intellij.platform.bookmarks.frontend
+  - name: intellij.platform.debugger.impl.bookmarks
+  - name: intellij.platform.frontend.split.bookmarks

platform/bookmarks/plugin/resources/META-INF/plugin.xml

@@ -0,0 +1,15 @@
+<!--suppress SplitModeMixedDependencies -->
+<!--suppress PluginXmlPluginLogo -->
+<idea-plugin>
+  <id>intellij.bookmarks.plugin</id>
+  <name>Bookmarks Manager</name>
+  <description>Provides platform modules for IDE bookmarks support.</description>
+  <vendor>JetBrains</vendor>
+  <content namespace="jetbrains">
+    <module name="intellij.platform.bookmarks" loading="required"/>
+    <module name="intellij.platform.bookmarks.backend"/>
+    <module name="intellij.platform.bookmarks.frontend"/>
+    <module name="intellij.platform.debugger.impl.bookmarks"/>
+    <module name="intellij.platform.frontend.split.bookmarks"/>
+  </content>
+</idea-plugin>

platform/build-scripts/product-dsl/src/ModuleSetPlugins.kt

@@ -6,10 +6,15 @@ import com.intellij.platform.pluginGraph.TargetName
 
 private const val MODULE_SET_PLUGIN_MODULE_PREFIX: String = "intellij.moduleSet.plugin."
 
+private val HAND_WRITTEN_MODULE_SET_PLUGIN_MODULES: Set<String> = setOf(
+  "intellij.platform.bookmarks.plugin",
+  "intellij.platform.navbar.plugin",
+)
+
 fun moduleSetPluginModuleName(moduleSetName: String): TargetName {
   return TargetName(MODULE_SET_PLUGIN_MODULE_PREFIX + moduleSetName)
 }
 
 fun isModuleSetPluginModuleName(moduleName: String): Boolean {
-  return moduleName.startsWith(MODULE_SET_PLUGIN_MODULE_PREFIX)
+  return moduleName.startsWith(MODULE_SET_PLUGIN_MODULE_PREFIX) || moduleName in HAND_WRITTEN_MODULE_SET_PLUGIN_MODULES
 }

platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt

@@ -145,10 +145,6 @@ object CommunityModuleSets {
     module("intellij.platform.managed.cache.backend")
     embeddedModule("intellij.platform.feedback")
 
-    embeddedModule("intellij.platform.bookmarks")
-    module("intellij.platform.bookmarks.backend")
-    module("intellij.platform.bookmarks.frontend")
-
     module("intellij.platform.pluginManager.shared")
     module("intellij.platform.pluginManager.backend")
     module("intellij.platform.pluginManager.frontend")

platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/ProductModulesLayout.kt

@@ -23,6 +23,7 @@ import org.jetbrains.intellij.build.impl.PluginLayout
 val DEFAULT_BUNDLED_PLUGINS: PersistentList<String> = persistentListOf(
   "intellij.dev",
   "intellij.jcef.plugin",
+  "intellij.platform.bookmarks.plugin",
   "intellij.moduleSet.plugin.grid.core",
   "intellij.platform.navbar.plugin",
   "intellij.moduleSet.plugin.recentFiles",

platform/favoritesTreeView/resources/intellij.platform.ide.favoritesTreeView.xml

@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.platform.analysis"/>

platform/main/intellij.platform.frontend.main/BUILD.bazel

@@ -12,7 +12,7 @@ jvm_library(
     "//platform/xdebugger-impl/frontend",
     "//platform/searchEverywhere/frontend",
     "//platform/vcs-impl/frontend",
-    "//platform/bookmarks/frontend",
+    "//platform/bookmarks/plugin",
     "//platform/recentFiles/frontend",
     "//platform/pluginManager/frontend",
     "//platform/execution-impl/frontend",
@@ -37,7 +37,7 @@ jvm_library(
     "//platform/xdebugger-impl/frontend:frontend_test_lib",
     "//platform/searchEverywhere/frontend:frontend_test_lib",
     "//platform/vcs-impl/frontend:frontend_test_lib",
-    "//platform/bookmarks/frontend:frontend_test_lib",
+    "//platform/bookmarks/plugin:plugin_test_lib",
     "//platform/recentFiles/frontend:frontend_test_lib",
     "//platform/pluginManager/frontend:frontend_test_lib",
     "//platform/execution-impl/frontend:frontend_test_lib",

platform/main/intellij.platform.frontend.main/intellij.platform.frontend.main.iml

@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.frontend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.searchEverywhere.frontend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl.frontend" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.platform.bookmarks.frontend" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.bookmarks.plugin" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.recentFiles.frontend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.pluginManager.frontend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl.frontend" />

platform/navbar/backend/resources/intellij.platform.navbar.backend.xml

@@ -2,7 +2,20 @@
 <idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.platform.editor.ui"/>
+    <module name="intellij.platform.ide"/>
+    <module name="intellij.platform.ide.core"/>
+    <module name="intellij.platform.ide.impl"/>
+    <module name="intellij.platform.lang"/>
+    <module name="intellij.platform.lang.core"/>
+    <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.navbar"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.platform.projectModel.impl"/>
+    <module name="intellij.platform.util.ui"/>
   </dependencies>
   <!-- endregion -->
   <extensionPoints>

platform/navbar/frontend/resources/intellij.platform.navbar.frontend.xml

@@ -2,7 +2,20 @@
 <idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.platform.editor.ui"/>
+    <module name="intellij.platform.ide"/>
+    <module name="intellij.platform.ide.core"/>
+    <module name="intellij.platform.ide.impl"/>
+    <module name="intellij.platform.lang"/>
+    <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.navbar"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.platform.statistics"/>
+    <module name="intellij.platform.util.coroutines"/>
+    <module name="intellij.platform.util.ui"/>
   </dependencies>
   <!-- endregion -->
   <extensions defaultExtensionNs="com.intellij">

platform/navbar/monolith/resources/intellij.platform.navbar.monolith.xml

@@ -2,6 +2,10 @@
 <idea-plugin>
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.platform.ide"/>
+    <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.navbar.backend"/>
     <module name="intellij.platform.navbar.frontend"/>
   </dependencies>

platform/navbar/shared/resources/intellij.platform.navbar.xml

@@ -1,2 +1,9 @@
 <idea-plugin visibility="public">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+  <dependencies>
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.platform.ide.impl"/>
+    <module name="intellij.platform.lang.impl"/>
+  </dependencies>
+  <!-- endregion -->
 </idea-plugin>

platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml

@@ -311,9 +311,6 @@
     <module name="intellij.platform.managed.cache"/>
     <module name="intellij.platform.managed.cache.backend"/>
     <module name="intellij.platform.feedback" loading="embedded"/>
-    <module name="intellij.platform.bookmarks" loading="embedded"/>
-    <module name="intellij.platform.bookmarks.backend"/>
-    <module name="intellij.platform.bookmarks.frontend"/>
     <module name="intellij.platform.pluginManager.shared"/>
     <module name="intellij.platform.pluginManager.backend"/>
     <module name="intellij.platform.pluginManager.frontend"/>

platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml

@@ -314,9 +314,6 @@
     <module name="intellij.platform.managed.cache"/>
     <module name="intellij.platform.managed.cache.backend"/>
     <module name="intellij.platform.feedback" loading="embedded"/>
-    <module name="intellij.platform.bookmarks" loading="embedded"/>
-    <module name="intellij.platform.bookmarks.backend"/>
-    <module name="intellij.platform.bookmarks.frontend"/>
     <module name="intellij.platform.pluginManager.shared"/>
     <module name="intellij.platform.pluginManager.backend"/>
     <module name="intellij.platform.pluginManager.frontend"/>

platform/xdebugger-impl/BUILD.bazel

@@ -183,6 +183,8 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core",
     "//platform/core-api:core_test_lib",
+    "//platform/bookmarks",
+    "//platform/bookmarks:bookmarks_test_lib",
     "//platform/xdebugger-api:debugger",
     "//platform/xdebugger-api:debugger_test_lib",
     "//platform/editor-ui-api:editor-ui",
@@ -270,6 +272,8 @@ jvm_library(
     "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline",
     "//platform/xdebugger-impl/shared",
     "//platform/xdebugger-impl/shared:shared_test_lib",
+    "//platform/xdebugger-impl/bookmarks",
+    "//platform/xdebugger-impl/bookmarks:bookmarks_test_lib",
     "//platform/xdebugger-impl/rpc",
     "//platform/xdebugger-impl/rpc:rpc_test_lib",
     "//platform/xdebugger-impl/ui",

platform/xdebugger-impl/bookmarks/BUILD.bazel

@@ -0,0 +1,73 @@
+### auto-generated section `build intellij.platform.debugger.impl.bookmarks` start
+load("//build:compiler-options.bzl", "create_kotlinc_options")
+load("@rules_jvm//:jvm.bzl", "jvm_library")
+
+create_kotlinc_options(
+  name = "custom_bookmarks",
+  x_context_parameters = True
+)
+
+jvm_library(
+  name = "bookmarks",
+  module_name = "intellij.platform.debugger.impl.bookmarks",
+  visibility = ["//visibility:public"],
+  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
+  resources = glob(["resources/**/*"]),
+  resource_strip_prefix = "resources",
+  kotlinc_opts = ":custom_bookmarks",
+  deps = [
+    "@lib//:jetbrains-annotations",
+    "@lib//:kotlin-stdlib",
+    "//libraries/kotlinx/coroutines/core",
+    "//platform/analysis-api:analysis",
+    "//platform/bookmarks",
+    "//platform/core-api:core",
+    "//platform/core-impl",
+    "//platform/core-ui",
+    "//platform/xdebugger-api:debugger",
+    "//platform/xdebugger-impl/shared",
+    "//platform/xdebugger-impl/ui",
+    "//platform/editor-ui-api:editor-ui",
+    "//platform/ide-core",
+    "//platform/platform-impl:ide-impl",
+    "//platform/lang-api:lang",
+    "//platform/projectModel-api:projectModel",
+    "//platform/util",
+    "//platform/util:util-ui",
+  ]
+)
+
+jvm_library(
+  name = "bookmarks_test_lib",
+  testonly = True,
+  module_name = "intellij.platform.debugger.impl.bookmarks",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  kotlinc_opts = ":custom_bookmarks",
+  runtime_deps = [
+    ":bookmarks",
+    "//libraries/kotlinx/coroutines/core:core_test_lib",
+    "//platform/analysis-api:analysis_test_lib",
+    "//platform/bookmarks:bookmarks_test_lib",
+    "//platform/core-api:core_test_lib",
+    "//platform/core-impl:core-impl_test_lib",
+    "//platform/core-ui:core-ui_test_lib",
+    "//platform/xdebugger-api:debugger_test_lib",
+    "//platform/xdebugger-impl/shared:shared_test_lib",
+    "//platform/xdebugger-impl/ui:ui_test_lib",
+    "//platform/editor-ui-api:editor-ui_test_lib",
+    "//platform/ide-core:ide-core_test_lib",
+    "//platform/platform-impl:ide-impl_test_lib",
+    "//platform/lang-api:lang_test_lib",
+    "//platform/projectModel-api:projectModel_test_lib",
+    "//platform/util:util_test_lib",
+    "//platform/util:util-ui_test_lib",
+  ]
+)
+### auto-generated section `build intellij.platform.debugger.impl.bookmarks` end
+
+### auto-generated section `iml intellij.platform.debugger.impl.bookmarks` start
+exports_files([
+  "intellij.platform.debugger.impl.bookmarks.iml",
+], visibility = ["//visibility:public"])
+### auto-generated section `iml intellij.platform.debugger.impl.bookmarks` end

platform/xdebugger-impl/bookmarks/intellij.platform.debugger.impl.bookmarks.iml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="5" platform="JVM 25" allPlatforms="JVM [25]" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-Xjvm-default=all -XXLanguage:+AllowEagerSupertypeAccessibilityChecks -Xcontext-parameters -progressive" />
+        </compilerSettings>
+        <compilerArguments>
+          <stringArguments>
+            <stringArg name="jvmTarget" arg="25" />
+            <stringArg name="apiVersion" arg="2.3" />
+            <stringArg name="languageVersion" arg="2.3" />
+          </stringArguments>
+          <arrayArguments>
+            <arrayArg name="pluginClasspaths">
+              <args>
+                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.4.0-RC-0.1/rpc-compiler-plugin-2.4.0-RC-0.1.jar</arg>
+              </args>
+            </arrayArg>
+            <arrayArg name="pluginOptions" />
+          </arrayArguments>
+        </compilerArguments>
+      </configuration>
+    </facet>
+  </component>
+  <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" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.bookmarks" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl.shared" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl.ui" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+  </component>
+</module>

platform/xdebugger-impl/bookmarks/resources/intellij.platform.debugger.impl.bookmarks.xml

@@ -0,0 +1,25 @@
+<idea-plugin package="com.intellij.platform.debugger.impl.bookmarks">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+  <dependencies>
+    <module name="intellij.libraries.kotlinx.coroutines.core"/>
+    <module name="intellij.platform.analysis"/>
+    <module name="intellij.platform.bookmarks"/>
+    <module name="intellij.platform.core"/>
+    <module name="intellij.platform.core.impl"/>
+    <module name="intellij.platform.core.ui"/>
+    <module name="intellij.platform.debugger"/>
+    <module name="intellij.platform.debugger.impl.shared"/>
+    <module name="intellij.platform.debugger.impl.ui"/>
+    <module name="intellij.platform.editor.ui"/>
+    <module name="intellij.platform.ide.core"/>
+    <module name="intellij.platform.ide.impl"/>
+    <module name="intellij.platform.lang"/>
+    <module name="intellij.platform.projectModel"/>
+    <module name="intellij.platform.util.ui"/>
+  </dependencies>
+  <!-- endregion -->
+
+  <extensions defaultExtensionNs="com.intellij">
+    <bookmarksListProvider implementation="com.intellij.platform.debugger.impl.bookmarks.BreakpointListProvider"/>
+  </extensions>
+</idea-plugin>

platform/xdebugger-impl/bookmarks/src/com/intellij/platform/debugger/impl/bookmarks/BreakpointListProvider.kt

@@ -1,5 +1,5 @@
-// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.xdebugger.impl.breakpoints
+// 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.platform.debugger.impl.bookmarks
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.bookmark.BookmarksListProvider
@@ -204,4 +204,4 @@ class BreakpointListUpdaterService(internal val cs: CoroutineScope) {
   @Volatile
   var updateJob: Job? = null
     internal set
-}
+}

platform/xdebugger-impl/intellij.platform.debugger.impl.tests.iml

@@ -36,6 +36,7 @@
     <orderEntry type="module" module-name="intellij.platform.codeStyle" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.bookmarks" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
@@ -84,6 +85,7 @@
     <orderEntry type="module" module-name="intellij.platform.project" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.codeinsight.inline" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.shared" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl.bookmarks" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.rpc" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.rpc.topics" scope="TEST" />

platform/xdebugger-impl/testSrc/com/intellij/xdebugger/BreakpointListProviderTest.kt

@@ -6,9 +6,9 @@ import com.intellij.ide.util.treeView.AbstractTreeNode
 import com.intellij.openapi.components.service
 import com.intellij.openapi.progress.runBlockingMaybeCancellable
 import com.intellij.openapi.util.registry.Registry
+import com.intellij.platform.debugger.impl.bookmarks.BreakpointListUpdaterService
 import com.intellij.xdebugger.breakpoints.XBreakpoint
 import com.intellij.xdebugger.breakpoints.XBreakpointType
-import com.intellij.xdebugger.impl.breakpoints.BreakpointListUpdaterService
 import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase
 import com.intellij.xdebugger.impl.breakpoints.XBreakpointManagerImpl
 import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem

platform/xdebugger-impl/ui/BUILD.bazel

@@ -25,7 +25,6 @@ jvm_library(
     "//libraries/kotlinx/coroutines/core",
     "//libraries/stream",
     "//platform/analysis-api:analysis",
-    "//platform/bookmarks",
     "//platform/code-style-api:codeStyle",
     "//platform/util/concurrency",
     "//platform/core-api:core",
@@ -83,7 +82,6 @@ jvm_library(
     "//libraries/kotlinx/coroutines/core:core_test_lib",
     "//libraries/stream:stream_test_lib",
     "//platform/analysis-api:analysis_test_lib",
-    "//platform/bookmarks:bookmarks_test_lib",
     "//platform/code-style-api:codeStyle_test_lib",
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core_test_lib",

platform/xdebugger-impl/ui/api-dump.txt

@@ -80,9 +80,6 @@ c:com.intellij.xdebugger.impl.actions.ViewBreakpointsAction
 - actionPerformed(com.intellij.openapi.actionSystem.AnActionEvent):V
 - getActionUpdateThread():com.intellij.openapi.actionSystem.ActionUpdateThread
 - update(com.intellij.openapi.actionSystem.AnActionEvent):V
-f:com.intellij.xdebugger.impl.breakpoints.BreakpointListUpdaterService
-- <init>(kotlinx.coroutines.CoroutineScope):V
-- f:getUpdateJob():kotlinx.coroutines.Job
 com.intellij.xdebugger.impl.breakpoints.XBreakpointTypeWithDocumentDelegation
 - a:getDocumentForHighlighting(com.intellij.openapi.editor.Document):com.intellij.openapi.editor.Document
 c:com.intellij.xdebugger.impl.breakpoints.XExpressionState

platform/xdebugger-impl/ui/intellij.platform.debugger.impl.ui.iml

@@ -42,7 +42,6 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
-    <orderEntry type="module" module-name="intellij.platform.bookmarks" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />

platform/xdebugger-impl/ui/resources/intellij.platform.debugger.impl.ui.xml

@@ -10,7 +10,6 @@
     <module name="intellij.libraries.kotlinx.serialization.core"/>
     <module name="intellij.libraries.stream"/>
     <module name="intellij.platform.analysis"/>
-    <module name="intellij.platform.bookmarks"/>
     <module name="intellij.platform.codeStyle"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.core.impl"/>