[remote dev] refactoring: introduce and use intellij.platform.backend module as a marker for modules not compatible with the frontend process

Before, we used intellij.platform.monolith module for that, but it looks strange when modules that can work at the backend have dependency on 'monolith'. And it may cause problems in the future if we start using separate installations for monolith and backend. So given that to fix IJPL-164312 we need to mark more modules as incompatible with frontend, it's better to use the proper marker. GitOrigin-RevId: 329fdcd99a298e56baaf9dfdac75604ec512f84c
2025-12-16 14:23:28 +07:00 · 2025-01-10 14:12:48 +01:00
parent 9d925a1859
commit 16cd137c98
22 changed files with 35 additions and 12 deletions
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -605,6 +605,7 @@
      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/backend/intellij.platform.backend.iml" filepath="$PROJECT_DIR$/platform/backend/intellij.platform.backend.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/main/intellij.platform.backend.main/intellij.platform.backend.main.iml" filepath="$PROJECT_DIR$/platform/main/intellij.platform.backend.main/intellij.platform.backend.main.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/backend/observation/intellij.platform.backend.observation.iml" filepath="$PROJECT_DIR$/platform/backend/observation/intellij.platform.backend.observation.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/backend/workspace/intellij.platform.backend.workspace.iml" filepath="$PROJECT_DIR$/platform/backend/workspace/intellij.platform.backend.workspace.iml" />
--- a/platform/backend/intellij.platform.backend.iml
+++ b/platform/backend/intellij.platform.backend.iml
@@ -0,0 +1,9 @@
+<?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$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/platform/backend/module-info.md
+++ b/platform/backend/module-info.md
@@ -0,0 +1,5 @@
+### Module `intellij.platform.backend`
+
+This is a root module in the hierarchy of modules which implement heavy backend functionality of the platform. 
+Modules which depend on this module can be loaded by a regular monolith IDE and by an IDE running as a backend in the remote development
+scenario. They won't be loaded by an IDE running in frontend mode (JetBrains Client).
--- a/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml
+++ b/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml
@@ -35,6 +35,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.bookmarks" exported="" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
--- a/platform/kernel/backend/intellij.platform.kernel.backend.iml
+++ b/platform/kernel/backend/intellij.platform.kernel.backend.iml
@@ -30,6 +30,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.extensions" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
--- a/platform/monolith/intellij.platform.monolith.iml
+++ b/platform/monolith/intellij.platform.monolith.iml
@@ -5,5 +5,6 @@
    <content url="file://$MODULE_DIR$" />
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
  </component>
 </module>
--- a/platform/progress/backend/intellij.platform.progress.backend.iml
+++ b/platform/progress/backend/intellij.platform.progress.backend.iml
@@ -9,6 +9,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.progress" />
--- a/platform/project/backend/intellij.platform.project.backend.iml
+++ b/platform/project/backend/intellij.platform.project.backend.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.project" />
--- a/platform/runtime/product/src/impl/ProductModes.java
+++ b/platform/runtime/product/src/impl/ProductModes.java
@@ -19,7 +19,7 @@ final class ProductModes {
   */
  public static @NotNull RuntimeModuleId getIncompatibleRootModule(@NotNull ProductMode mode) {
    switch (mode) {
-      case FRONTEND: return RuntimeModuleId.module("intellij.platform.monolith");
+      case FRONTEND: return RuntimeModuleId.module("intellij.platform.backend");
      
      case MONOLITH: return RuntimeModuleId.module("intellij.platform.frontend.split");

--- a/platform/runtime/product/tests/testSrc/serialization/ProductModulesLoaderTest.kt
+++ b/platform/runtime/product/tests/testSrc/serialization/ProductModulesLoaderTest.kt
@@ -104,7 +104,8 @@ class ProductModulesLoaderTest {
      tempDirectory.rootPath,
      RawRuntimeModuleDescriptor.create("root", emptyList(), emptyList()),
      RawRuntimeModuleDescriptor.create("intellij.platform.frontend.split", emptyList(), emptyList()),
-      RawRuntimeModuleDescriptor.create("intellij.platform.monolith", emptyList(), emptyList()),
+      RawRuntimeModuleDescriptor.create("intellij.platform.backend", emptyList(), emptyList()),
+      RawRuntimeModuleDescriptor.create("intellij.platform.monolith", emptyList(), listOf("intellij.platform.backend")),
      RawRuntimeModuleDescriptor.create("plugin", listOf("plugin"), emptyList()),
      RawRuntimeModuleDescriptor.create("plugin.common", emptyList(), listOf("plugin")),
      RawRuntimeModuleDescriptor.create("plugin.frontend", emptyList(), listOf("plugin", "intellij.platform.frontend.split")),
--- a/platform/vcs-api/intellij.platform.vcs.iml
+++ b/platform/vcs-api/intellij.platform.vcs.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.vcs.core" exported="" />
--- a/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
+++ b/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
@@ -36,6 +36,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.ide.core" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
--- a/plugins/markdown/fenceInjection/intellij.markdown.fenceInjection.iml
+++ b/plugins/markdown/fenceInjection/intellij.markdown.fenceInjection.iml
@@ -13,7 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.langInjection" />
    <orderEntry type="module" module-name="intellij.xml.langInjection" scope="PROVIDED" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
  </component>
 </module>
--- a/plugins/markdown/frontmatter/intellij.markdown.frontmatter.iml
+++ b/plugins/markdown/frontmatter/intellij.markdown.frontmatter.iml
@@ -15,7 +15,7 @@
    <orderEntry type="module" module-name="intellij.markdown.frontmatter.toml" />
    <orderEntry type="module" module-name="intellij.markdown.frontmatter.yaml" />
    <orderEntry type="module" module-name="intellij.json" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
  </component>
 </module>
--- a/plugins/markdown/frontmatter/toml/intellij.markdown.frontmatter.toml.iml
+++ b/plugins/markdown/frontmatter/toml/intellij.markdown.frontmatter.toml.iml
@@ -13,7 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.markdown" />
    <orderEntry type="module" module-name="intellij.toml.core" scope="PROVIDED" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
  </component>
 </module>
--- a/plugins/markdown/frontmatter/yaml/intellij.markdown.frontmatter.yaml.iml
+++ b/plugins/markdown/frontmatter/yaml/intellij.markdown.frontmatter.yaml.iml
@@ -14,6 +14,6 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.yaml" />
    <orderEntry type="module" module-name="intellij.yaml.editing" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
  </component>
 </module>
--- a/plugins/markdown/images/intellij.markdown.images.iml
+++ b/plugins/markdown/images/intellij.markdown.images.iml
@@ -14,7 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.images" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
  </component>
 </module>
--- a/plugins/markdown/model/intellij.markdown.model.iml
+++ b/plugins/markdown/model/intellij.markdown.model.iml
@@ -16,7 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
  </component>
 </module>
--- a/plugins/markdown/spellchecker/intellij.markdown.spellchecker.iml
+++ b/plugins/markdown/spellchecker/intellij.markdown.spellchecker.iml
@@ -13,6 +13,6 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
  </component>
 </module>
--- a/plugins/markdown/xml/intellij.markdown.xml.iml
+++ b/plugins/markdown/xml/intellij.markdown.xml.iml
@@ -14,6 +14,6 @@
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
  </component>
 </module>
--- a/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml
+++ b/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml
@@ -13,6 +13,6 @@
    <orderEntry type="module" module-name="intellij.platform.ide.core" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
  </component>
 </module>
--- a/plugins/terminal/sh/intellij.terminal.sh.iml
+++ b/plugins/terminal/sh/intellij.terminal.sh.iml
@@ -32,7 +32,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.terminal" />
    <orderEntry type="module" module-name="intellij.sh.core" />
-    <orderEntry type="module" module-name="intellij.platform.monolith" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
    <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
  </component>