IDEA-293582: move keymap xmls to their plugins

GitOrigin-RevId: 70122c6e30902842905a0e6033de78c598b5eeab
This commit is contained in:
Maria Filipanova
2023-02-07 15:12:33 +00:00
committed by intellij-monorepo-bot
parent 3b434f92af
commit 3fc54b7d13
28 changed files with 2 additions and 13 deletions
@@ -69,8 +69,7 @@ open class DefaultKeymap {
loadKeymap(getKeymapName(bean), object : SchemeDataHolder<KeymapImpl> {
override fun read(): Element {
val effectiveFile = getEffectiveFile(bean)
// java plugin defines keymap that located in a core plugin - so, we must check parents
val data = ResourceUtil.getResourceAsBytes(effectiveFile, pluginDescriptor.classLoader, true)
val data = ResourceUtil.getResourceAsBytes(effectiveFile, pluginDescriptor.classLoader)
if (data == null) {
throw PluginException("Cannot find $effectiveFile", pluginDescriptor.pluginId)
}
@@ -114,7 +114,7 @@ class KeymapManagerImpl : KeymapManagerEx(), PersistentStateComponent<Element> {
// schemeManager.findSchemeByName(KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP) == null) return
val keymap = DefaultKeymap.getInstance().loadKeymap(keymapName, object : SchemeDataHolder<KeymapImpl> {
override fun read(): Element {
return JDOMUtil.load(ResourceUtil.getResourceAsBytes(getEffectiveFile(ep), pluginDescriptor.classLoader, true))
return JDOMUtil.load(ResourceUtil.getResourceAsBytes(getEffectiveFile(ep), pluginDescriptor.classLoader))
}
}, pluginDescriptor)
schemeManager.addScheme(keymap)
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>