IJPL-222664 IJ-MR-179029 IJ-MR-184993 IJ-MR-181153 remove confusing community generator and update docs

GitOrigin-RevId: 31d79eb2e72d260213cbf27d74054acf096f10c7
2026-09-27 10:03:11 +07:00 · 2025-12-10 22:34:20 +00:00
parent 97aa115b11
commit 9d959e61bc
97 changed files with 124 additions and 196 deletions
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.bifurcan"/>
    <module name="fleet.fastutil"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.util.serialization"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.bifurcan"/>
    <module name="fleet.fastutil"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.multiplatform.shims"/>
    <module name="fleet.reporting.api"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.fastutil"/>
    <module name="fleet.multiplatform.shims"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.multiplatform.shims"/>
    <module name="fleet.reporting.api"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.multiplatform.shims"/>
    <module name="fleet.reporting.api"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.util.core"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.multiplatform.shims"/>
    <module name="fleet.reporting.api"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.multiplatform.shims"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.java.aetherDependencyResolver"/>
    <module name="intellij.libraries.maven.resolver.provider"/>
@@ -1,6 +1,6 @@
 <idea-plugin visibility="internal">
  <dependencies>
-    <!-- region Generated dependencies - do not edit manually -->
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
    <module name="intellij.libraries.grpc"/>
    <module name="intellij.platform.core"/>
    <!-- endregion -->
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.jackson"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.jackson"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.jackson"/>
  </dependencies>
@@ -2,7 +2,7 @@
 <!-- see the comment where we do include it about why we have dependency on it (yes, ktor-core wants this lib) -->
 <idea-plugin visibility="internal">
  <dependencies>
-    <!-- region Generated dependencies - do not edit manually -->
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
    <module name="intellij.libraries.kotlinx.coroutines.slf4j"/>
    <module name="intellij.libraries.ktor.io"/>
    <module name="intellij.libraries.ktor.utils"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.io"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.ktor.io"/>
  </dependencies>
@@ -1,6 +1,6 @@
 <!-- depends on jettison (https://youtrack.jetbrains.com/issue/IJPL-211789/CNFE-org.codehaus.jettison.mapped.Configuration)  -->
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.jettison"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.core"/>
    <module name="intellij.platform.core.ui"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.fastutil"/>
    <module name="intellij.libraries.gson"/>
@@ -11,7 +11,6 @@ import org.jetbrains.intellij.build.productLayout.discovery.discoverModuleSets
 import org.jetbrains.intellij.build.productLayout.stats.FileChangeStatus
 import org.jetbrains.intellij.build.productLayout.stats.ModuleSetFileResult
 import org.jetbrains.intellij.build.productLayout.stats.ModuleSetGenerationResult
-import org.jetbrains.intellij.build.productLayout.stats.printGenerationSummary
 import org.jetbrains.jps.model.java.JavaResourceRootType
 import java.nio.file.Files
 import java.nio.file.Path
@@ -195,7 +194,7 @@ internal fun buildModuleSetXml(moduleSet: ModuleSet, label: String): ModuleSetBu
    // Add generated file header
    val mainClass = if (label == "community") "CommunityModuleSets" else "UltimateModuleSets"
    append("<!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->\n")
-    append("<!-- To regenerate, run: ${mainClass}.main() -->\n")
+    append("<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->\n")
    append("<!-- Source: see moduleSet(\"${moduleSet.name}\") function in ${mainClass}.kt -->\n")
    append("<!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->\n")

@@ -278,64 +277,6 @@ internal fun cleanupOrphanedModuleSetFiles(
  return deletedFiles
 }

-/**
- * Generates all module set XMLs for the given object.
- * Discovers all ModuleSet functions via reflection, generates XML files, and prints results.
- *
- * Automatically cleans up outdated module set XML files that no longer have corresponding
- * Kotlin module set functions.
- *
- * @param obj The object containing module set functions (e.g., CommunityModuleSets, UltimateModuleSets)
- * @param outputDir Directory where XML files will be generated
- * @param label Description label for logging (e.g., "community", "ultimate")
- * @param projectRoot Project root path for relativizing paths in output
- * @param moduleOutputProvider Optional provider for resolving module output directories (required if module sets use outputModule)
- * @param printSummary Whether to print generation summary (default: true)
- */
-fun generateAllModuleSets(
-  obj: Any,
-  outputDir: Path,
-  label: String,
-  projectRoot: Path,
-  moduleOutputProvider: ModuleOutputProvider? = null,
-  printSummary: Boolean = true,
-) {
-  val startTime = System.currentTimeMillis()
-  Files.createDirectories(outputDir)
-
-  val moduleSets = discoverModuleSets(obj)
-
-  // Generate all module set XML files first
-  val fileResults = moduleSets.map { moduleSet ->
-    val targetOutputDir = resolveOutputDir(moduleSet, outputDir, moduleOutputProvider)
-    generateModuleSetXml(moduleSet, targetOutputDir, label)
-  }
-
-  // Build map of output directory -> generated file names for cleanup (from generation results)
-  val outputDirToGeneratedFiles = mutableMapOf<Path, MutableSet<String>>()
-  for ((moduleSet, fileResult) in moduleSets.zip(fileResults)) {
-    val targetOutputDir = resolveOutputDir(moduleSet, outputDir, moduleOutputProvider)
-    outputDirToGeneratedFiles.computeIfAbsent(targetOutputDir) { mutableSetOf() }.add(fileResult.fileName)
-  }
-
-  // Clean up orphaned files after generation (safe for standalone runs)
-  val deletedFiles = cleanupOrphanedModuleSetFiles(outputDirToGeneratedFiles)
-
-  // Combine generated files and deleted files
-  val allResults = fileResults + deletedFiles
-
-  if (printSummary) {
-    val result = ModuleSetGenerationResult(label, outputDir, allResults, outputDirToGeneratedFiles)
-    printGenerationSummary(
-      moduleSetResults = listOf(result),
-      dependencyResult = null,
-      productResult = null,
-      projectRoot = projectRoot,
-      durationMs = System.currentTimeMillis() - startTime,
-    )
-  }
-}
-
 /**
 * Resolves the output directory for a module set.
 * If the module set has an outputModule specified, uses that module's resources directory.
@@ -84,7 +84,11 @@ private suspend fun generatePluginDependency(
  // Also process content modules - generate dependencies for their module descriptors
  val contentModuleResults = mutableListOf<DependencyFileResult>()
  for (contentModuleName in info.contentModules) {
-    val result = generateContentModuleDependencies(contentModuleName = contentModuleName, descriptorCache = descriptorCache, dependencyFilter = { dependencyFilter(contentModuleName, it) })
+    val result = generateContentModuleDependencies(
+      contentModuleName = contentModuleName,
+      descriptorCache = descriptorCache,
+      dependencyFilter = { dependencyFilter(contentModuleName, it) }
+    )
    if (result != null) {
      contentModuleResults.add(result)
    }
@@ -111,16 +115,6 @@ private suspend fun generateContentModuleDependencies(
 ): DependencyFileResult? {
  val info = descriptorCache.getOrAnalyze(contentModuleName) ?: return null
  val filteredDeps = info.dependencies.filter(dependencyFilter)
-  val status = updateXmlDependencies(
-    path = info.descriptorPath,
-    content = info.content,
-    moduleDependencies = filteredDeps,
-    preserveExistingModule = { !dependencyFilter(it) },
-  )
-  return DependencyFileResult(
-    moduleName = contentModuleName,
-    descriptorPath = info.descriptorPath,
-    status = status,
-    dependencyCount = filteredDeps.size
-  )
+  val status = updateXmlDependencies(path = info.descriptorPath, content = info.content, moduleDependencies = filteredDeps, preserveExistingModule = { !dependencyFilter(it) })
+  return DependencyFileResult(moduleName = contentModuleName, descriptorPath = info.descriptorPath, status = status, dependencyCount = filteredDeps.size)
 }
@@ -2,6 +2,8 @@
 package org.jetbrains.intellij.build.productLayout.xml

 import com.intellij.util.xml.dom.createXmlStreamReaderWithLocation
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.jetbrains.intellij.build.productLayout.stats.FileChangeStatus
 import java.io.StringReader
 import java.nio.file.Files
@@ -13,7 +15,7 @@ import javax.xml.stream.XMLStreamConstants
 * Preserves formatting outside `<dependencies>` section.
 */

-private const val REGION_START = "<!-- region Generated dependencies - do not edit manually -->"
+private const val REGION_START = "<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->"
 private const val REGION_END = "<!-- endregion -->"
 private const val REGION_MARKER = "region Generated dependencies"
 // Legacy marker for backward compatibility with existing files
@@ -71,7 +73,7 @@ private fun StringBuilder.appendModules(indent: String, modules: List<String>) {
 * @param preserveExistingModule Predicate to identify which existing modules should be preserved (manual deps)
 * @return FileChangeStatus indicating what changed
 */
-internal fun updateXmlDependencies(
+internal suspend fun updateXmlDependencies(
  path: Path,
  content: String,
  moduleDependencies: List<String>,
@@ -103,10 +105,11 @@ internal fun updateXmlDependencies(

  val autoModules = moduleDependencies.sorted()

-  // Skip writing if the module set is unchanged AND file already uses new region format
-  // (force rewrite if file uses legacy editor-fold markers to convert to new format)
+  // Skip writing if the module set is unchanged AND file already uses current region format
+  // Force rewrite if file uses legacy editor-fold markers or old region text without re-gen instructions
  val usesLegacyMarkers = content.contains(LEGACY_MARKER) && !content.contains(REGION_MARKER)
-  if (moduleNames.sorted() == (autoModules + manualModuleNames).distinct().sorted() && !usesLegacyMarkers) {
+  val usesOldRegionText = content.contains(REGION_MARKER) && !content.contains(REGION_START)
+  if (moduleNames.sorted() == (autoModules + manualModuleNames).distinct().sorted() && !usesLegacyMarkers && !usesOldRegionText) {
    return FileChangeStatus.UNCHANGED
  }

@@ -222,7 +225,7 @@ private fun buildFullBlock(indent: String, manualEntries: List<DepEntry>, autoMo
  }.toString()
 }

-/** Full <dependencies> section preserving original order of plugins + manual modules (for NONE case) */
+/** Full <dependencies> section preserving original order of plugins and manual modules (for `NONE` case) */
 private fun buildWithEntries(indent: String, manualEntries: List<DepEntry>, autoModules: List<String>): String {
  return StringBuilder().apply {
    append(indent).append("<dependencies>\n")
@@ -241,8 +244,12 @@ private fun buildWithEntries(indent: String, manualEntries: List<DepEntry>, auto
  }.toString()
 }

-private fun writeIfChanged(path: Path, oldContent: String, newContent: String): FileChangeStatus {
-  if (newContent == oldContent) return FileChangeStatus.UNCHANGED
-  Files.writeString(path, newContent)
+private suspend fun writeIfChanged(path: Path, oldContent: String, newContent: String): FileChangeStatus {
+  if (newContent == oldContent) {
+    return FileChangeStatus.UNCHANGED
+  }
+  withContext(Dispatchers.IO) {
+    Files.writeString(path, newContent)
+  }
  return if (oldContent.contains(REGION_MARKER) || oldContent.contains(LEGACY_MARKER)) FileChangeStatus.MODIFIED else FileChangeStatus.CREATED
 }
@@ -3,13 +3,11 @@

 package org.jetbrains.intellij.build.productLayout

-import com.intellij.openapi.application.PathManager
 import org.jetbrains.intellij.build.productLayout.CommunityModuleSets.essential
 import org.jetbrains.intellij.build.productLayout.CoreModuleSets.coreLang
 import org.jetbrains.intellij.build.productLayout.CoreModuleSets.librariesKtor
 import org.jetbrains.intellij.build.productLayout.CoreModuleSets.librariesMisc
 import org.jetbrains.intellij.build.productLayout.CoreModuleSets.rpcBackend
-import java.nio.file.Path

 /**
 * Community module sets for IDE features that build on CoreModuleSets.
@@ -24,30 +22,14 @@ import java.nio.file.Path
 *
 * Has a one-way dependency on CoreModuleSets (libraries, platform infrastructure, RPC).
 *
+ * **How to regenerate XML files:**
+ * - IDE: Run configuration "Generate Product Layouts"
+ * - Bazel: `bazel run //platform/buildScripts:plugin-model-tool`
+ *
 * @see CoreModuleSets for platform infrastructure (libraries, corePlatform, coreIde, coreLang, rpc, fleet)
 * @see <a href="../product-dsl/module-sets.md">Module Sets Documentation</a>
 */
 object CommunityModuleSets {
-  /**
-   * Main method to regenerate all community module set XML files from Kotlin definitions.
-   * Run this whenever module sets are modified to keep XML files in sync.
-   */
-  @JvmStatic
-  fun main(args: Array<String>) {
-    @Suppress("TestOnlyProblems")
-    val projectRoot = Path.of(PathManager.getHomePathFor(CommunityModuleSets::class.java)!!)
-
-    kotlinx.coroutines.runBlocking {
-      generateAllModuleSets(
-        obj = CommunityModuleSets,
-        outputDir = projectRoot.resolve("community/platform/platform-resources/generated/META-INF"),
-        label = "community",
-        projectRoot = projectRoot,
-        moduleOutputProvider = createModuleOutputProvider(projectRoot, this)
-      )
-    }
-  }
-
  // region Essential and Debugger

  /**
@@ -24,6 +24,10 @@ import org.jetbrains.intellij.build.productLayout.CoreModuleSets.rpcMinimal
 *
 * CommunityModuleSets builds on top of these with IDE features (essential, debugger, vcs, xml, etc.)
 * and has a one-way dependency on CoreModuleSets.
+ *
+ * **How to regenerate XML files:**
+ * - IDE: Run configuration "Generate Product Layouts"
+ * - Bazel: `bazel run //platform/buildScripts:plugin-model-tool`
 */
 object CoreModuleSets {
  // region Libraries
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.netty.codec.http"/>
    <module name="intellij.platform.analysis"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.caffeine"/>
    <module name="intellij.libraries.commons.imaging"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.collections.immutable"/>
    <module name="intellij.libraries.kotlinx.coroutines.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.aalto.xml"/>
    <module name="intellij.libraries.automaton"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.hash4j"/>
    <module name="intellij.platform.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.bouncy.castle.provider"/>
    <module name="intellij.libraries.caffeine"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.core"/>
    <module name="intellij.platform.core.ui"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.analysis"/>
    <module name="intellij.platform.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.fastutil"/>
    <module name="intellij.libraries.guava"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.hash4j"/>
    <module name="intellij.libraries.kotlinx.coroutines.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.netty.buffer"/>
    <module name="intellij.libraries.netty.codec.http"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.core"/>
    <module name="intellij.platform.core.ui"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.analysis"/>
    <module name="intellij.platform.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.commons.cli"/>
    <module name="intellij.libraries.fastutil"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.serialization.core"/>
    <module name="intellij.platform.analysis"/>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("core.platform") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("rpc.minimal") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.coroutines.core"/>
    <module name="intellij.libraries.kotlinx.serialization.core"/>
@@ -4,7 +4,7 @@
      <module name="intellij.platform.jewel.markdown.core"/>
      <module name="intellij.platform.jewel.markdown.ideLafBridgeStyling"/>
      <module name="intellij.platform.jewel.markdown.extensions.images"/>
-      <!-- region Generated dependencies - do not edit manually -->
+      <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
      <module name="intellij.libraries.compose.foundation.desktop"/>
      <module name="intellij.libraries.skiko"/>
      <!-- endregion -->
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.rpc"/>
    <module name="fleet.util.logging.api"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.kernel"/>
    <module name="intellij.libraries.kotlinx.collections.immutable"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.analysis"/>
    <module name="intellij.platform.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.analysis"/>
    <module name="intellij.platform.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.caffeine"/>
    <module name="intellij.libraries.cli.parser"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.fastutil"/>
    <module name="intellij.platform.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.coroutines.core"/>
    <module name="intellij.platform.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.coroutines.core"/>
    <module name="intellij.libraries.kotlinx.serialization.core"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.caffeine"/>
    <module name="intellij.libraries.jackson"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.caffeine"/>
    <module name="intellij.libraries.guava"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="fleet.andel"/>
    <module name="fleet.util.core"/>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("compose") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("core.ide") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("core.lang") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("debugger.streams") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("debugger") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("duplicates") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("elevation") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("essential.minimal") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("essential") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("fleet") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("grid.core") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("ide.common") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("libraries.ide") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("libraries.ktor") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("libraries.misc") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("libraries.platform") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("libraries.temporaryBundled") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("rd.common") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("recentFiles") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: UltimateModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("rpc.backend.extended") function in UltimateModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("vcs.frontend") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("vcs.shared") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("vcs") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
-<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- To regenerate, run: `Generate Product Layouts` or `bazel run //platform/buildScripts:plugin-model-tool` -->
 <!-- Source: see moduleSet("xml") function in CommunityModuleSets.kt -->
 <!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
 <idea-plugin>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.commons.compress"/>
    <module name="intellij.libraries.fastutil"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.platform.core"/>
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.fastutil"/>
    <module name="intellij.libraries.guava"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.serialization.core"/>
    <module name="intellij.libraries.kotlinx.serialization.json"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.aalto.xml"/>
    <module name="intellij.libraries.jackson"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.fastutil"/>
    <module name="intellij.platform.analysis"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="internal">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.caffeine"/>
    <module name="intellij.libraries.fastutil"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.aalto.xml"/>
    <module name="intellij.libraries.caffeine"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.serialization.core"/>
    <module name="intellij.libraries.kotlinx.serialization.json"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.fastutil"/>
    <module name="intellij.libraries.jackson"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.serialization.core"/>
    <module name="intellij.libraries.kotlinx.serialization.json"/>
@@ -1,5 +1,5 @@
 <idea-plugin visibility="public">
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.serialization.core"/>
    <module name="intellij.libraries.kotlinx.serialization.json"/>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.kotlinx.coroutines.core"/>
    <module name="intellij.platform.core"/>
@@ -7,7 +7,7 @@
    <module name="intellij.properties.backend"/>
    <module name="intellij.properties.backend.psi"/>
    <module name="intellij.libraries.xerces"/>
-    <!-- region Generated dependencies - do not edit manually -->
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
    <module name="intellij.java.aetherDependencyResolver"/>
    <!-- endregion -->
  </dependencies>
@@ -4,7 +4,7 @@
    <plugin id="com.intellij.java"/>
    <plugin id="org.jetbrains.kotlin"/>
    <module name="intellij.devkit.core"/>
-    <!-- region Generated dependencies - do not edit manually -->
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
    <module name="intellij.java.aetherDependencyResolver"/>
    <!-- endregion -->
  </dependencies>
@@ -1,5 +1,5 @@
 <idea-plugin>
-  <!-- region Generated dependencies - do not edit manually -->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
  <dependencies>
    <module name="intellij.libraries.ai.grazie.spell.gec.engine.local"/>
    <module name="intellij.libraries.commons.text"/>
@@ -2,7 +2,7 @@
  <dependencies>
    <module name="intellij.platform.compose"/>
    <module name="intellij.platform.compose.markdown"/>
-    <!-- region Generated dependencies - do not edit manually -->
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
    <module name="intellij.libraries.coil"/>
    <module name="intellij.libraries.compose.foundation.desktop"/>
    <!-- endregion -->