diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/src/META-INF/IdeaPlugin.xml | 21 | ||||
| -rw-r--r-- | resources/src/idea/RichPlatformPlugin.xml | 7 |
2 files changed, 9 insertions, 19 deletions
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 5f6c484bed22..602a51eca96d 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -10,6 +10,9 @@ <xi:include href="/componentSets/Debugger.xml" xpointer="xpointer(/components/*)"/> <xi:include href="/META-INF/IntentionPowerPack.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="/META-INF/InspectionGadgets.xml" xpointer="xpointer(/idea-plugin/*)"/> + <xi:include href="/META-INF/ManifestSupport.xml" xpointer="xpointer(/idea-plugin/*)"> + <xi:fallback/> + </xi:include> <application-components> <component> @@ -222,8 +225,6 @@ <extensionPoint name="java.compilerOutputIndex" area="IDEA_PROJECT" interface="com.intellij.compilerOutputIndex.api.indexer.CompilerOutputBaseIndex"/> <extensionPoint name="vetoSPICondition" interface="com.intellij.openapi.util.Condition"/> - - <extensionPoint name="manifest.parser.provider" interface="org.jetbrains.lang.manifest.header.HeaderParserProvider"/> </extensionPoints> <extensions defaultExtensionNs="com.intellij"> @@ -1438,22 +1439,6 @@ <lang.commenter language="SPI" implementationClass="com.intellij.spi.SPICommenter"/> <annotator language="SPI" implementationClass="com.intellij.spi.SPIAnnotator"/> - <fileTypeFactory implementation="org.jetbrains.lang.manifest.ManifestFileTypeFactory"/> - <lang.parserDefinition language="Manifest" implementationClass="org.jetbrains.lang.manifest.parser.ManifestParserDefinition"/> - <lang.syntaxHighlighterFactory key="Manifest" implementationClass="org.jetbrains.lang.manifest.highlighting.ManifestSyntaxHighlighterFactory"/> - <annotator language="Manifest" implementationClass="org.jetbrains.lang.manifest.highlighting.HeaderAnnotator"/> - <lang.elementManipulator forClass="org.jetbrains.lang.manifest.psi.HeaderValuePart" - implementationClass="org.jetbrains.lang.manifest.psi.impl.HeaderValuePartManipulator"/> - <completion.contributor language="Manifest" implementationClass="org.jetbrains.lang.manifest.completion.ManifestCompletionContributor"/> - <manifest.parser.provider implementation="org.jetbrains.lang.manifest.header.impl.StandardManifestHeaderParsers"/> - - <applicationService serviceImplementation="org.jetbrains.lang.manifest.header.HeaderParserRepository"/> - - <localInspection language="Manifest" displayName="Missing Final New Line" groupName="Manifest" - enabledByDefault="true" level="ERROR" implementationClass="org.jetbrains.lang.manifest.highlighting.MissingFinalNewlineInspection"/> - <localInspection language="Manifest" displayName="Unknown or Misspelled Header Name" groupName="Manifest" - enabledByDefault="true" level="WARNING" implementationClass="org.jetbrains.lang.manifest.highlighting.MisspelledHeaderInspection"/> - <gotoDeclarationHandler implementation="com.intellij.codeInsight.navigation.actions.GotoLambdaParameterHandler"/> <java.compilerOutputIndex implementation="com.intellij.compilerOutputIndex.impl.MethodsUsageIndex"/> diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml index c539ddb15bde..9e841a297e95 100644 --- a/resources/src/idea/RichPlatformPlugin.xml +++ b/resources/src/idea/RichPlatformPlugin.xml @@ -385,7 +385,12 @@ </extensions> <xi:include href="/META-INF/xdebugger.xml" xpointer="xpointer(/idea-plugin/*)"/> - <xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)"/> + <xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)"> + <xi:fallback/> + </xi:include> + <xi:include href="/META-INF/RemoteServersJava.xml" xpointer="xpointer(/idea-plugin/*)"> + <xi:fallback/> + </xi:include> <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/> |