diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
| commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /resources/src/META-INF/IdeaPlugin.xml | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
| download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'resources/src/META-INF/IdeaPlugin.xml')
| -rw-r--r-- | resources/src/META-INF/IdeaPlugin.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 329fc3def69f..9764417638d6 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -9,16 +9,26 @@ <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/structuralsearch.xml" xpointer="xpointer(/idea-plugin/*)"> + <xi:fallback/> + </xi:include> + <xi:include href="/META-INF/structuralsearch-java.xml" xpointer="xpointer(/idea-plugin/*)"/> <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> + <xi:include href="/META-INF/TypeMigration.xml" xpointer="xpointer(/idea-plugin/*)"> + <xi:fallback/> + </xi:include> <application-components> <component> <implementation-class>com.intellij.util.xml.impl.JavaDomApplicationComponent</implementation-class> </component> + <component> + <implementation-class>com.intellij.codeInspection.bytecodeAnalysis.BytecodeAnalysisConverter</implementation-class> + </component> </application-components> <project-components> @@ -1356,6 +1366,8 @@ <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaSuperClassNameOccurenceIndex"/> <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaMethodParameterTypesIndex"/> + <fileBasedIndex implementation="com.intellij.codeInspection.bytecodeAnalysis.BytecodeAnalysisIndex"/> + <stubElementTypeHolder class="com.intellij.psi.impl.java.stubs.JavaStubElementTypes"/> <dom.customAnnotationChecker implementation="com.intellij.util.xml.impl.ExtendsClassChecker"/> @@ -1416,6 +1428,8 @@ <resolveScopeEnlarger implementation="com.intellij.psi.NonClasspathResolveScopeEnlarger"/> <xdebugger.debuggerSupport implementation="com.intellij.debugger.ui.JavaDebuggerSupport"/> + <xdebugger.settings implementation="com.intellij.debugger.settings.JavaDebuggerSettings"/> + <xdebugger.breakpointType implementation="com.intellij.debugger.ui.breakpoints.JavaMethodBreakpointType"/> <xdebugger.breakpointType implementation="com.intellij.debugger.ui.breakpoints.JavaWildcardMethodBreakpointType"/> <xdebugger.breakpointType implementation="com.intellij.debugger.ui.breakpoints.JavaFieldBreakpointType"/> @@ -1471,7 +1485,6 @@ implementationClass="com.intellij.psi.impl.JavaRegExpHost"/> <psi.referenceContributor language="JAVA" implementation="com.intellij.psi.impl.source.resolve.reference.impl.JavaReflectionReferenceContributor"/> - <psi.referenceContributor language="JAVA" implementation="com.intellij.psi.impl.source.resolve.reference.impl.JavaCharsetReferenceContributor"/> <writingAccessProvider implementation="com.intellij.refactoring.util.ClsElementWritingAccessProvider"/> @@ -1509,6 +1522,8 @@ <projectOpenProcessor implementation="com.intellij.platform.PlatformProjectOpenProcessor" order="last"/> <projectService serviceInterface="com.intellij.platform.ProjectBaseDirectory" serviceImplementation="com.intellij.platform.ProjectBaseDirectory"/> + <projectService serviceInterface="com.intellij.codeInspection.bytecodeAnalysis.ProjectBytecodeAnalysis" + serviceImplementation="com.intellij.codeInspection.bytecodeAnalysis.ProjectBytecodeAnalysis"/> <spellchecker.support language="JAVA" implementationClass="com.intellij.spellchecker.JavaSpellcheckingStrategy"/> <codeInsight.template.postfixTemplateProvider language="JAVA" |