From d25370dca64afa653768acbdb8c274f18e112500 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 8 Apr 2024 19:34:09 +0200
Subject: [PATCH] Revert "IJPL-973 add extracted modules to products using
 x-include (later, we can move more common modules to this list)"

This reverts commit 445cf458b388fff32a158872b86d86891157e9ea.

GitOrigin-RevId: 564d46b0065c7d195764010f56330ab94b8720c7
---
 .idea/modules.xml                                |  2 +-
 .../resources/META-INF/IdeaPlugin.xml            |  4 ++--
 .../intellij/build/impl/PlatformModules.kt       | 16 ++++------------
 .../libraries}/grpc/intellij.libraries.grpc.iml  |  0
 .../grpc/resources/intellij.libraries.grpc.xml   |  0
 .../src/META-INF/PlatformLangPlugin.xml          |  3 +++
 .../src/META-INF/common-ide-modules.xml          |  8 --------
 .../resources/META-INF/PyCharmCorePlugin.xml     |  2 +-
 8 files changed, 11 insertions(+), 24 deletions(-)
 rename {libraries => platform/libraries}/grpc/intellij.libraries.grpc.iml (100%)
 rename {libraries => platform/libraries}/grpc/resources/intellij.libraries.grpc.xml (100%)
 delete mode 100644 platform/platform-resources/src/META-INF/common-ide-modules.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index da901b6be475..1d4ca8371574 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -855,7 +855,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/intellij.kotlin.plugin.community.main.iml" filepath="$PROJECT_DIR$/plugins/kotlin/intellij.kotlin.plugin.community.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" filepath="$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" filepath="$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" />
-      <module fileurl="file://$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" filepath="$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/libraries/grpc/intellij.libraries.grpc.iml" filepath="$PROJECT_DIR$/platform/libraries/grpc/intellij.libraries.grpc.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" filepath="$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" filepath="$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" filepath="$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" />
diff --git a/community-resources/resources/META-INF/IdeaPlugin.xml b/community-resources/resources/META-INF/IdeaPlugin.xml
index ffeaf63b27f0..e3a3eee1f968 100644
--- a/community-resources/resources/META-INF/IdeaPlugin.xml
+++ b/community-resources/resources/META-INF/IdeaPlugin.xml
@@ -10,6 +10,7 @@
   <content>
     <module name="intellij.notebooks.visualization"/>
     <module name="intellij.notebooks.ui"/>
+    <module name="intellij.platform.images.copyright"/>
     <module name="intellij.xml.xmlbeans"/>
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ml.embeddings"/>
@@ -18,8 +19,7 @@
     <module name="intellij.platform.experiment"/>
     <module name="intellij.idea.customization.base"/>
   </content>
-  <xi:include href="/META-INF/common-ide-modules.xml"/>
-
+  
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.intellij.openapi.updateSettings.UpdateStrategyCustomization"
                         serviceImplementation="com.intellij.openapi.updateSettings.base.ShowWhatIsNewPageAfterUpdateCustomization"
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 2a815b6ba6b6..3f5ee87d8406 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -529,21 +529,13 @@ private suspend fun getProductPluginContentModules(context: BuildContext, produc
     readXmlAsModel(file)
   }?.let { root ->
     collectProductModules(root = root, result = result)
-
-    // we don't want to allow providing product modules in any x-include, check only specific ones
-    if (root.children.any { it.name == "include" && it.getAttributeValue("href") == "/META-INF/common-ide-modules.xml" }) {
-      collectProductModules(
-        root = readXmlAsModel(context.findFileInModuleSources("intellij.platform.resources", "META-INF/common-ide-modules.xml")!!),
-        result = result,
-      )
-    }
   }
 
   withContext(Dispatchers.IO) {
-    collectProductModules(
-      root = readXmlAsModel(context.findFileInModuleSources("intellij.platform.resources", "META-INF/PlatformLangPlugin.xml")!!),
-      result = result,
-    )
+    val file = context.findFileInModuleSources("intellij.platform.resources", "META-INF/PlatformLangPlugin.xml")
+    file?.let { readXmlAsModel(it) }
+  }?.let {
+    collectProductModules(root = it, result = result)
   }
 
   return result
diff --git a/libraries/grpc/intellij.libraries.grpc.iml b/platform/libraries/grpc/intellij.libraries.grpc.iml
similarity index 100%
rename from libraries/grpc/intellij.libraries.grpc.iml
rename to platform/libraries/grpc/intellij.libraries.grpc.iml
diff --git a/libraries/grpc/resources/intellij.libraries.grpc.xml b/platform/libraries/grpc/resources/intellij.libraries.grpc.xml
similarity index 100%
rename from libraries/grpc/resources/intellij.libraries.grpc.xml
rename to platform/libraries/grpc/resources/intellij.libraries.grpc.xml
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 7efd006e033d..e13b3c0fa49b 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -14,6 +14,9 @@
     <module name="intellij.platform.navbar.compatibility.ide"/>
     <module name="intellij.platform.navbar.compatibility.monolith"/>
     <module name="intellij.platform.settings.local"/>
+
+    <module name="intellij.platform.vcs.log.impl"/>
+    <module name="intellij.platform.vcs.dvcs.impl"/>
   </content>
 
   <xi:include href="PlatformLangComponents.xml"/>
diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml
deleted file mode 100644
index 712aa5ff4374..000000000000
--- a/platform/platform-resources/src/META-INF/common-ide-modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<idea>
-  <content>
-    <module name="intellij.platform.images.copyright"/>
-
-    <module name="intellij.platform.vcs.log.impl"/>
-    <module name="intellij.platform.vcs.dvcs.impl"/>
-  </content>
-</idea>
\ No newline at end of file
diff --git a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
index 4af24ce16b03..022ec05b7f38 100644
--- a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
@@ -6,11 +6,11 @@
   <content>
     <module name="intellij.notebooks.visualization"/>
     <module name="intellij.notebooks.ui"/>
+    <module name="intellij.platform.images.copyright"/>
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ml.embeddings"/>
     <module name="intellij.ide.startup.importSettings"/>
   </content>
-  <xi:include href="/META-INF/common-ide-modules.xml"/>
 
   <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>