diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-07-08 11:26:24 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-07-08 11:26:24 -0700 |
| commit | c1ace1f7e1e49c81bb4b75377c99f07be340abfe (patch) | |
| tree | 9d0db96bd3d86ddfec80e7e3554cad9dcc066553 /resources | |
| parent | c6218e46d5d2017e987ecdbd99b318a95c42abc0 (diff) | |
| download | idea-c1ace1f7e1e49c81bb4b75377c99f07be340abfe.tar.gz | |
Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/resources.iml | 3 | ||||
| -rw-r--r-- | resources/src/META-INF/IdeaPlugin.xml | 6 | ||||
| -rw-r--r-- | resources/src/idea/RichPlatformPlugin.xml | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/resources/resources.iml b/resources/resources.iml index 1f8b3f27d2df..b4aa76b27b85 100644 --- a/resources/resources.iml +++ b/resources/resources.iml @@ -12,6 +12,9 @@ <orderEntry type="module" module-name="images" exported="" /> <orderEntry type="module" module-name="community-resources" exported="" /> <orderEntry type="module" module-name="util" /> + <orderEntry type="module" module-name="InspectionGadgetsAnalysis" /> + <orderEntry type="module" module-name="IntentionPowerPackPlugin" /> + <orderEntry type="module" module-name="remote-servers-impl" exported="" scope="RUNTIME" /> </component> <component name="copyright"> <Base> diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 41f591ab724c..7b4639795788 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -8,6 +8,8 @@ <xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/component/*)"/> <xi:include href="/META-INF/ExternalSystemExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/> <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/*)"/> <application-components> <component> @@ -314,7 +316,7 @@ order="last, before default"/> <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaDocCompletionContributor" id="javadoc" - order="last, before javaLegacy"/> + order="last, before javaLegacy, before wordCompletion"/> <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.NullSmartCompletionContributor" id="smartNull" order="last, before javaSmart"/> @@ -462,7 +464,7 @@ <externalProjectDataService implementation="com.intellij.externalSystem.JavaProjectDataService"/> - <specialTool shortName="UnusedDeclaration" displayName="Unused declaration" groupBundle="messages.InspectionsBundle" + <globalInspection shortName="UnusedDeclaration" displayName="Unused declaration" groupBundle="messages.InspectionsBundle" groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING" implementationClass="com.intellij.codeInspection.deadCode.UnusedDeclarationInspection"/> <globalInspection shortName="UnusedLibrary" bundle="messages.InspectionsBundle" key="unused.library.display.name" diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml index a2c79d736efb..dcb2acda4d18 100644 --- a/resources/src/idea/RichPlatformPlugin.xml +++ b/resources/src/idea/RichPlatformPlugin.xml @@ -385,6 +385,7 @@ </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/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/> |