summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/src/META-INF/IdeaPlugin.xml23
-rw-r--r--resources/src/idea/JavaActions.xml5
-rw-r--r--resources/src/idea/RichPlatformActions.xml13
-rw-r--r--resources/src/idea/RichPlatformPlugin.xml15
4 files changed, 23 insertions, 33 deletions
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index f9d4d4c60ba8..93cee99db49e 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -518,6 +518,9 @@
<localInspection language="JAVA" shortName="ConstantConditions" bundle="messages.InspectionsBundle" key="inspection.data.flow.display.name"
groupName="Probable bugs" enabledByDefault="true" level="WARNING"
implementationClass="com.intellij.codeInspection.dataFlow.DataFlowInspection"/>
+ <localInspection language="JAVA" shortName="Contract" bundle="messages.InspectionsBundle" key="inspection.contract.display.name"
+ groupName="Probable bugs" enabledByDefault="true" level="WARNING"
+ implementationClass="com.intellij.codeInspection.dataFlow.ContractInspection"/>
<localInspection language="JAVA" shortName="UnusedAssignment" displayName="Unused assignment" groupName="Probable bugs" enabledByDefault="true"
level="WARNING" implementationClass="com.intellij.codeInspection.defUse.DefUseInspection"/>
<localInspection language="JAVA" shortName="NumericOverflow" displayName="Numeric overflow" groupName="Numeric issues" enabledByDefault="true"
@@ -658,6 +661,11 @@
groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
implementationClass="com.intellij.codeInspection.inheritance.SuperClassHasFrequentlyUsedInheritorsInspection"
displayName="Class may extend a commonly used base class instead of implementing interface"/>
+ <localInspection language="JAVA" shortName="BlockMarkerComments"
+ groupBundle="messages.InspectionsBundle"
+ groupName="Code style issues" enabledByDefault="false" level="WARNING"
+ implementationClass="com.intellij.codeInspection.BlockMarkerCommentsInspection"
+ displayName="Block marker comment"/>
<intentionAction>
<className>com.intellij.codeInsight.daemon.quickFix.RedundantLambdaParameterTypeIntention</className>
@@ -707,6 +715,10 @@
<className>com.intellij.codeInsight.intention.impl.DeannotateIntentionAction</className>
<category>Control Flow</category>
</intentionAction>
+ <intentionAction>
+ <className>com.intellij.codeInsight.intention.impl.CreateSwitchIntention</className>
+ <category>Control Flow</category>
+ </intentionAction>
<intentionAction>
<className>com.intellij.codeInsight.intention.impl.CreateFieldFromParameterAction</className>
@@ -733,6 +745,10 @@
<category>Declaration</category>
</intentionAction>
<intentionAction>
+ <className>com.intellij.testIntegration.createTest.GenerateMissedTestsAction</className>
+ <category>Declaration</category>
+ </intentionAction>
+ <intentionAction>
<className>com.intellij.codeInsight.intention.impl.CreateSubclassAction</className>
<category>Declaration</category>
</intentionAction>
@@ -847,6 +863,11 @@
</intentionAction>
<intentionAction>
+ <className>com.intellij.codeInsight.intention.impl.AddJavadocIntention</className>
+ <category>Declaration</category>
+ </intentionAction>
+
+ <intentionAction>
<className>com.intellij.codeInsight.intention.impl.ConvertAbsolutePathToRelativeIntentionAction</className>
<category>Other</category>
</intentionAction>
@@ -867,8 +888,6 @@
</intentionAction>
-
-
<intentionAction>
<className>com.intellij.codeInspection.concurrencyAnnotations.JCiPOrderEntryFix</className>
</intentionAction>
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index d90a1dee1849..81721a90017a 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -160,8 +160,7 @@
<add-to-group group-id="XDebugger.Watches.Tree.Popup" anchor="last"/>
</action>
<action id="Debugger.ViewText" class="com.intellij.debugger.actions.ViewTextAction">
- <add-to-group group-id="XDebugger.Variables.Tree.Popup" anchor="before" relative-to-action="Debugger.ViewAsGroup"/>
- <add-to-group group-id="XDebugger.Watches.Tree.Popup" anchor="before" relative-to-action="Debugger.CustomizeContextView"/>
+ <add-to-group group-id="XDebugger.ValueGroup" anchor="last"/>
</action>
<action id="Debugger.CopyValue" class="com.intellij.debugger.actions.CopyValueAction"/>
<action id="Debugger.CompareValueWithClipboard" class="com.intellij.debugger.actions.CompareValueWithClipboardAction"/>
@@ -177,7 +176,7 @@
<action id="Debugger.RemoveAllWatches" class="com.intellij.debugger.actions.RemoveAllWatchesAction"/>
<action id="Debugger.RemoveWatch" class="com.intellij.debugger.actions.RemoveWatchAction" icon="AllIcons.Actions.Delete"/>
<action id="Debugger.ViewAsGroup" class="com.intellij.debugger.actions.ViewAsGroup">
- <add-to-group group-id="XDebugger.Variables.Tree.Popup" anchor="before" relative-to-action="Debugger.CustomizeContextView"/>
+ <add-to-group group-id="XDebugger.ValueGroup" anchor="last"/>
</action>
<!--<action id="Debugger.SetValue" class="com.intellij.debugger.actions.SetValueAction"/>-->
<!--<action id="Debugger.ShowAsHex" class="com.intellij.debugger.actions.ShowAsHexAction" text="Show as Hex"/>-->
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index 0822f3c29e6c..e54edddfc3fa 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -98,7 +98,6 @@
<action id="CompileDirty" class="com.intellij.compiler.actions.CompileDirtyAction" icon="AllIcons.Actions.Compile"/>
<action id="MakeModule" class="com.intellij.compiler.actions.MakeModuleAction"/>
<action id="Compile" class="com.intellij.compiler.actions.CompileAction"/>
- <action id="RunAPT" class="com.intellij.compiler.actions.ProcessAnnotationsAction"/>
<separator/>
<action id="CompileProject" class="com.intellij.compiler.actions.CompileProjectAction"/>
<separator/>
@@ -149,9 +148,6 @@
<separator/>
- <action internal="true" id="CompilerTest" class="com.intellij.compiler.impl.javaCompiler.api.CompilerPerfTestAction"
- text="Test Rebuild Performance"/>
-
<add-to-group group-id="Internal" anchor="last"/>
</group>
@@ -177,13 +173,9 @@
<add-to-group group-id="EditorPopupMenu.Run" anchor="first"/>
</reference>
- <reference ref="RunAPT">
- <add-to-group group-id="EditorPopupMenu.Run" anchor="first"/>
- </reference>
<group id="EditorTabCompileGroup">
<reference ref="Compile"/>
- <reference ref="RunAPT"/>
<add-to-group group-id="EditorTabPopupMenuEx" anchor="before" relative-to-action="RunContextPopupGroup"/>
</group>
@@ -209,7 +201,6 @@
<group id="ProjectViewCompileGroup">
<reference ref="MakeModule"/>
<reference ref="Compile"/>
- <reference ref="RunAPT"/>
<add-to-group group-id="ProjectViewPopupMenuRunGroup" anchor="first"/>
</group>
@@ -232,7 +223,6 @@
<group id="StructureViewCompileGroup">
<separator/>
<reference ref="Compile"/>
- <reference ref="RunAPT"/>
<add-to-group group-id="StructureViewPopupMenu" anchor="after" relative-to-action="RunContextPopupGroup"/>
</group>
@@ -256,7 +246,6 @@
<reference ref="$Delete"/>
<separator/>
<reference ref="Compile"/>
- <reference ref="RunAPT"/>
<reference ref="VersionControlsGroup"/>
<separator/>
@@ -297,7 +286,6 @@
<reference ref="AddToFavorites"/>
<separator/>
<reference ref="Compile"/>
- <reference ref="RunAPT"/>
<reference ref="RunContextPopupGroup"/>
<separator/>
@@ -337,7 +325,6 @@
<reference ref="$Delete"/>
<separator/>
<reference ref="Compile"/>
- <reference ref="RunAPT"/>
<reference ref="RunContextPopupGroup"/>
<separator/>
<reference ref="VersionControlsGroup"/>
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 7b38db51ac53..ae9befc8fe2e 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -35,21 +35,12 @@
<extensionPoint name="compiler.buildParticipantProvider"
interface="com.intellij.openapi.compiler.make.BuildParticipantProvider"/>
- <extensionPoint name="compiler.additionalCompileScopeProvider"
- interface="com.intellij.compiler.impl.AdditionalCompileScopeProvider"/>
-
<extensionPoint name="compiler.buildTargetScopeProvider"
interface="com.intellij.compiler.impl.BuildTargetScopeProvider"/>
- <extensionPoint name="compiler.makeDependencyProcessor"
- interface="com.intellij.compiler.DependencyProcessor"/>
-
<extensionPoint name="compiler.optionsManager"
interface="com.intellij.compiler.options.CompilerOptionsFilter"/>
- <extensionPoint name="compiler.resourceCompilerExtension"
- interface="com.intellij.compiler.impl.resourceCompiler.ResourceCompilerExtension"/>
-
<extensionPoint name="java.programPatcher"
interface="com.intellij.execution.runners.JavaProgramPatcher"/>
@@ -217,16 +208,10 @@
<projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration"
serviceImplementation="com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration"/>
- <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.api.CompilerAPIConfiguration"
- serviceImplementation="com.intellij.compiler.impl.javaCompiler.api.CompilerAPIConfiguration"/>
<projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerConfiguration"
serviceImplementation="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerConfiguration"/>
- <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompilerConfiguration"
- serviceImplementation="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompilerConfiguration"/>
<projectService serviceInterface="com.intellij.compiler.impl.rmiCompiler.RmicConfiguration"
serviceImplementation="com.intellij.compiler.impl.rmiCompiler.RmicConfiguration"/>
- <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.jikes.JikesConfiguration"
- serviceImplementation="com.intellij.compiler.impl.javaCompiler.jikes.JikesConfiguration"/>
<pathMacroFilter implementation="com.intellij.compiler.impl.javaCompiler.javac.JavacConfigurationMacroFilter"/>
<applicationService serviceInterface="com.intellij.openapi.wm.impl.FrameTitleBuilder"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 17:20:42 +0000