diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-16 18:07:37 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-16 18:09:03 -0700 |
| commit | 65f60eb9011bb2c549a6d83ae31257480368ddc5 (patch) | |
| tree | de0dca03bec460e8797332e5f460400f5cf6485f /resources | |
| parent | 9ea67227e8fdcf8ed37e65bb96e32767291d0f4f (diff) | |
| download | idea-65f60eb9011bb2c549a6d83ae31257480368ddc5.tar.gz | |
Snapshot idea/138.1029 from git://git.jetbrains.org/idea/community.git
Update from idea/138.538 to idea/138.1029
Change-Id: I828f829a968439a99ec67640990c18ff7c9b58ce
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/src/META-INF/IdeaPlugin.xml | 6 | ||||
| -rw-r--r-- | resources/src/idea/JavaActions.xml | 3 | ||||
| -rw-r--r-- | resources/src/idea/RichPlatformPlugin.xml | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 93cee99db49e..329fc3def69f 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -719,6 +719,10 @@ <className>com.intellij.codeInsight.intention.impl.CreateSwitchIntention</className> <category>Control Flow</category> </intentionAction> + <intentionAction> + <className>com.intellij.codeInsight.intention.impl.SwapIfStatementsIntentionAction</className> + <category>Control Flow</category> + </intentionAction> <intentionAction> <className>com.intellij.codeInsight.intention.impl.CreateFieldFromParameterAction</className> @@ -1467,6 +1471,7 @@ 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"/> @@ -1512,6 +1517,7 @@ <codeInsight.linkHandler prefix="#assignment/" handlerClass="com.intellij.codeInsight.intention.impl.config.AssignmentTooltipLinkHandler"/> <nonProjectFileWritingAccessExtension implementation="com.intellij.codeInsight.ExternalAnnotationsNonProjectFileWritingAccessExtension"/> + <lang.inspectionSuppressor language="JAVA" implementationClass="com.intellij.codeInspection.SuppressManagerImpl"/> </extensions> <actions> diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml index 81721a90017a..81a791f42208 100644 --- a/resources/src/idea/JavaActions.xml +++ b/resources/src/idea/JavaActions.xml @@ -117,7 +117,7 @@ <group id="ToggleBreakpointAction"> <action id="ToggleMethodBreakpoint" class="com.intellij.debugger.actions.ToggleMethodBreakpointAction"/> <action id="ToggleFieldBreakpoint" class="com.intellij.debugger.actions.ToggleFieldBreakpointAction"/> - <action id="ToggleBreakpointEnabled" class="com.intellij.debugger.actions.ToggleBreakpointEnabledAction"/> + <!--Moved to XDebugger <action id="ToggleBreakpointEnabled" class="com.intellij.debugger.actions.ToggleBreakpointEnabledAction"/>--> <add-to-group group-id="DebugMainMenu" anchor="after" relative-to-action="ToggleLineBreakpoint"/> </group> @@ -184,7 +184,6 @@ <action id="Debugger.ResumeThread" class="com.intellij.debugger.actions.ResumeThreadAction"/> <action id="Debugger.FreezeThread" class="com.intellij.debugger.actions.FreezeThreadAction"/> <action id="Debugger.InterruptThread" class="com.intellij.debugger.actions.InterruptThreadAction"/> - <action id="Debugger.FocusOnBreakpoint" class="com.intellij.debugger.ui.breakpoints.actions.FocusOnBreakpointAction"/> <add-to-group group-id="DebuggerActions" anchor="first"/> </group> diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml index ae9befc8fe2e..b27faab54d4a 100644 --- a/resources/src/idea/RichPlatformPlugin.xml +++ b/resources/src/idea/RichPlatformPlugin.xml @@ -113,7 +113,6 @@ <packaging.sourceItemProvider implementation="com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ArtifactsSourceItemsProvider"/> <packaging.artifactType implementation="com.intellij.packaging.impl.artifacts.JarArtifactType" order="first"/> <packaging.artifactType implementation="com.intellij.packaging.impl.artifacts.PlainArtifactType" order="last"/> - <compiler.additionalCompileScopeProvider implementation="com.intellij.packaging.impl.compiler.ArtifactAdditionalCompileScopeProvider"/> <compiler.buildTargetScopeProvider implementation="com.intellij.packaging.impl.compiler.ArtifactBuildTargetScopeProvider"/> <compiler implementation="com.intellij.packaging.impl.compiler.ArtifactsCompiler" id="artifactsCompiler"/> <gotoRelatedProvider implementation="com.intellij.testIntegration.GotoTestRelatedProvider"/> |