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/src/META-INF/IdeaPlugin.xml | |
| 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/src/META-INF/IdeaPlugin.xml')
| -rw-r--r-- | resources/src/META-INF/IdeaPlugin.xml | 6 |
1 files changed, 6 insertions, 0 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> |