MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

idea: reuse PlatformLangComponents.xml instead of using custom IdeaComponents.xml in IDEA

Browse Source 
Components which were present in IdeaComponents and not present in PlatformLangComponents are now registered in JavaIdePlugin directly. PlatformVcsDetector is the only component which is included into PlatformLangComponents but wasn't included into IdeaComponents, but adding it to IntelliJ IDEA shouldn't do any harm.

This is a preliminary step to reuse PlatformLangPlugin.xml in IntelliJ IDEA as well to make all IDEs consistent and avoid duplication. This is also needed to properly extract Java support to a separate plugin (IDEA-195719).
This commit is contained in:
nik
2019-03-20 10:52:33 +03:00
parent a44c7f1181
commit 259f603ff8
2 changed files with 9 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/src/META-INF/JavaIdePlugin.xml
+9 -1
View File
@@ -26,7 +26,9 @@
<module value="com.intellij.modules.xdebugger"/>
<module value="com.intellij.modules.externalSystem"/>
<xi:include href="/componentSets/IdeaComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/PlatformLangComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/Compiler.xml" xpointer="xpointer(/idea-plugin/*)"/>
<extensionPoints>
<xi:include href="/META-INF/PlatformExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
@@ -207,6 +209,9 @@
</xi:include>
<application-components>
<component>
<implementation-class>com.intellij.internal.statistic.updater.StatisticsJobsScheduler</implementation-class>
</component>
<component>
<implementation-class>com.intellij.openapi.projectRoots.impl.DefaultJdkConfigurator</implementation-class>
<headless-implementation-class/>
@@ -214,6 +219,9 @@
</application-components>
<project-components>
<component>
<implementation-class>com.intellij.openapi.vcs.impl.ModuleVcsDetector</implementation-class>
</component>
<component>
<implementation-class>com.intellij.framework.detection.impl.FrameworkDetectionManager</implementation-class>
</component>
resources/src/componentSets/IdeaComponents.xml
-50
View File
@@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2001/XInclude
http://www.w3.org/2001/XInclude.xsd">
<application-components>
<component>
<implementation-class>com.intellij.openapi.util.registry.RegistryState</implementation-class>
</component>
<component>
<implementation-class>com.intellij.internal.statistic.updater.StatisticsJobsScheduler</implementation-class>
</component>
<component>
<interface-class>com.intellij.openapi.project.impl.ProjectStoreClassProvider</interface-class>
<implementation-class>com.intellij.configurationStore.PlatformLangProjectStoreClassProvider</implementation-class>
</component>
</application-components>
<xi:include href="/componentSets/Platform.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/UICore.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/WindowManagement.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/Lang.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/ProjectView.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/Editor.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="Compiler.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/Execution.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/componentSets/VCS.xml" xpointer="xpointer(/idea-plugin/*)"/>
<application-components>
<component>
<implementation-class>com.intellij.platform.PlatformProjectStarter</implementation-class>
</component>
</application-components>
<project-components>
<component>
<implementation-class>com.intellij.openapi.vcs.impl.ModuleVcsDetector</implementation-class>
</component>
<component>
<interface-class>com.intellij.profile.codeInspection.ProjectInspectionProfileManager</interface-class>
<implementation-class>com.intellij.profile.codeInspection.ProjectInspectionProfileManager</implementation-class>
<loadForDefaultProject/>
</component>
</project-components>
</idea-plugin>