IDEA-293582: move color schemes xmls to their plugins

GitOrigin-RevId: 73b60357f02c0083044ecf977d7c8422703df1e7
2026-04-21 22:11:40 +07:00 · 2022-08-23 12:37:46 +02:00
parent 5ceb7a8241
commit f14697d6e7
24 changed files with 1 additions and 25 deletions
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -788,7 +788,6 @@
      <module fileurl="file://$PROJECT_DIR$/platform/code-style-impl/intellij.platform.codeStyle.impl.iml" filepath="$PROJECT_DIR$/platform/code-style-impl/intellij.platform.codeStyle.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/collaboration-tools/intellij.platform.collaborationTools.iml" filepath="$PROJECT_DIR$/platform/collaboration-tools/intellij.platform.collaborationTools.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/collaboration-tools/auth/intellij.platform.collaborationTools.auth.iml" filepath="$PROJECT_DIR$/platform/collaboration-tools/auth/intellij.platform.collaborationTools.auth.iml" />
-      <module fileurl="file://$PROJECT_DIR$/colorSchemes/intellij.platform.colorSchemes.iml" filepath="$PROJECT_DIR$/colorSchemes/intellij.platform.colorSchemes.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/util/intellij.platform.concurrency.iml" filepath="$PROJECT_DIR$/platform/util/intellij.platform.concurrency.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml" filepath="$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml" filepath="$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml" />
--- a/colorSchemes/intellij.platform.colorSchemes.iml
+++ b/colorSchemes/intellij.platform.colorSchemes.iml
@@ -1,11 +0,0 @@
-<?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$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -97,7 +97,6 @@
    <orderEntry type="module" module-name="intellij.platform.remoteServers.impl" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.properties.resource.bundle.editor" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.xml.dom.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.javaFX.community" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.javaFX.jps" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.langInjection.tests" scope="TEST" />
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -288,7 +288,6 @@ object PlatformModules {
      "intellij.platform.icons",
      "intellij.platform.resources",
      "intellij.platform.resources.en",
-      "intellij.platform.colorSchemes",
    ), productLayout, layout)

    jar("stats.jar", listOf(
--- a/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt
@@ -143,7 +143,7 @@ class SchemeManagerImpl<T: Scheme, MUTABLE_SCHEME : T>(
      }
      else {
        val classLoader = pluginDescriptor.classLoader
-        bytes = ResourceUtil.getResourceAsBytes(resourceName.removePrefix("/"), classLoader, true)
+        bytes = ResourceUtil.getResourceAsBytes(resourceName.removePrefix("/"), classLoader)
        if (bytes == null) {
          LOG.error("Cannot found scheme $resourceName in $classLoader")
          return
--- a/plugins/color-schemes/all-hallows-eve-color-scheme/intellij.color.scheme.all_hallows_eve.iml
+++ b/plugins/color-schemes/all-hallows-eve-color-scheme/intellij.color.scheme.all_hallows_eve.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/all-hallows-eve-color-scheme/resources/colorSchemes/all_hallows_eve.xml
+++ b/plugins/color-schemes/all-hallows-eve-color-scheme/resources/colorSchemes/all_hallows_eve.xml
--- a/plugins/color-schemes/blackboard-color-scheme/intellij.color.scheme.blackboard.iml
+++ b/plugins/color-schemes/blackboard-color-scheme/intellij.color.scheme.blackboard.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/blackboard-color-scheme/resources/colorSchemes/blackboard.xml
+++ b/plugins/color-schemes/blackboard-color-scheme/resources/colorSchemes/blackboard.xml
--- a/plugins/color-schemes/cobalt-color-scheme/intellij.color.scheme.cobalt.iml
+++ b/plugins/color-schemes/cobalt-color-scheme/intellij.color.scheme.cobalt.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/cobalt-color-scheme/resources/colorSchemes/cobalt.xml
+++ b/plugins/color-schemes/cobalt-color-scheme/resources/colorSchemes/cobalt.xml
--- a/plugins/color-schemes/github-color-scheme/intellij.color.scheme.github.iml
+++ b/plugins/color-schemes/github-color-scheme/intellij.color.scheme.github.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/github-color-scheme/resources/colorSchemes/github.xml
+++ b/plugins/color-schemes/github-color-scheme/resources/colorSchemes/github.xml
--- a/plugins/color-schemes/monokai-color-scheme/intellij.color.scheme.monokai.iml
+++ b/plugins/color-schemes/monokai-color-scheme/intellij.color.scheme.monokai.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/monokai-color-scheme/resources/colorSchemes/monokai.xml
+++ b/plugins/color-schemes/monokai-color-scheme/resources/colorSchemes/monokai.xml
--- a/plugins/color-schemes/rails-casts-color-scheme/intellij.color.scheme.rails_casts.iml
+++ b/plugins/color-schemes/rails-casts-color-scheme/intellij.color.scheme.rails_casts.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/rails-casts-color-scheme/resources/colorSchemes/rails_casts.xml
+++ b/plugins/color-schemes/rails-casts-color-scheme/resources/colorSchemes/rails_casts.xml
--- a/plugins/color-schemes/twilight-color-scheme/intellij.color.scheme.twilight.iml
+++ b/plugins/color-schemes/twilight-color-scheme/intellij.color.scheme.twilight.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/twilight-color-scheme/resources/colorSchemes/twilight.xml
+++ b/plugins/color-schemes/twilight-color-scheme/resources/colorSchemes/twilight.xml
--- a/plugins/color-schemes/vibrant-ink-color-scheme/intellij.color.scheme.vibrant_ink.iml
+++ b/plugins/color-schemes/vibrant-ink-color-scheme/intellij.color.scheme.vibrant_ink.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/vibrant-ink-color-scheme/resources/colorSchemes/vibrant_ink.xml
+++ b/plugins/color-schemes/vibrant-ink-color-scheme/resources/colorSchemes/vibrant_ink.xml
--- a/plugins/color-schemes/warm-neon-color-scheme/intellij.color.scheme.warmNeon.iml
+++ b/plugins/color-schemes/warm-neon-color-scheme/intellij.color.scheme.warmNeon.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/color-schemes/warm-neon-color-scheme/resources/colorSchemes/WarmNeon.xml
+++ b/plugins/color-schemes/warm-neon-color-scheme/resources/colorSchemes/WarmNeon.xml
--- a/python/intellij.pycharm.community.main.iml
+++ b/python/intellij.pycharm.community.main.iml
@@ -5,7 +5,6 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.bootstrap" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="module" module-name="intellij.vcs.hg" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.vcs.svn" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.vcs.git" scope="RUNTIME" />