diff options
Diffstat (limited to 'resources/src')
-rw-r--r-- | resources/src/META-INF/IdeaPlugin.xml | 15 | ||||
-rw-r--r-- | resources/src/idea/RichPlatformActions.xml | 9 |
2 files changed, 13 insertions, 11 deletions
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 3c635fe04277..16ffa42d2855 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -169,6 +169,8 @@ <extensionPoint name="codeInsight.createFieldFromUsageHelper" beanClass="com.intellij.lang.LanguageExtensionPoint"> <with attribute="implementationClass" implements="com.intellij.codeInsight.daemon.impl.quickfix.CreateFieldFromUsageHelper"/> </extensionPoint> + + <extensionPoint name="getterSetterProvider" interface="com.intellij.codeInsight.generation.GetterSetterPrototypeProvider"/> <extensionPoint name="library.dependencyScopeSuggester" interface="com.intellij.openapi.roots.LibraryDependencyScopeSuggester"/> @@ -276,6 +278,7 @@ <lookup.actionProvider implementation="com.intellij.codeInsight.completion.ExcludeFromCompletionLookupActionProvider" id="excludeFromCompletion" order="last"/> + <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaNameIdentifierConfidence" id="javaNameIdentifierDefault"/> <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier" id="javaNameIdentifier"/> <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.FocusInJavadoc" id="javadoc" order="before javaComments"/> <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.UnfocusedComments" id="javaComments"/> @@ -301,8 +304,6 @@ order="before javaLegacy, before default"/> <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaMemberNameCompletionContributor" id="javaMemberName" order="before javaOverride"/> - <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaOverrideCompletionContributor" id="javaOverride" - order="before javaLegacy"/> <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaClassNameCompletionContributor" id="javaClassName" order="last, before default"/> @@ -372,7 +373,7 @@ <applicationService serviceInterface="com.intellij.psi.JavaDirectoryService" serviceImplementation="com.intellij.psi.impl.file.JavaDirectoryServiceImpl"/> - + <applicationService serviceInterface="com.intellij.openapi.projectRoots.JavaVersionService" serviceImplementation="com.intellij.openapi.projectRoots.JavaVersionServiceImpl"/> @@ -518,9 +519,6 @@ <localInspection language="JAVA" suppressId="deprecation" shortName="Deprecation" displayName="Deprecated API usage" groupName="" enabledByDefault="true" level="WARNING" implementationClass="com.intellij.codeInspection.deprecation.DeprecationInspection"/> - <localInspection language="JAVA" suppressId="extensionSyntax" bundle="messages.InspectionsBundle" key="deprecated.defender.syntax.description" - groupName="" enabledByDefault="true" level="ERROR" - implementationClass="com.intellij.codeInspection.deprecation.DeprecatedDefenderSyntaxInspection"/> <localInspection language="XML" shortName="DeprecatedClassUsageInspection" displayName="Deprecated API usage in XML" groupName="XML" enabledByDefault="true" level="WARNING" implementationClass="com.intellij.util.xml.DeprecatedClassUsageInspection"/> <localInspection language="JAVA" shortName="EqualsAndHashcode" bundle="messages.InspectionsBundle" key="inspection.equals.hashcode.display.name" @@ -859,7 +857,7 @@ <lang.whiteSpaceFormattingStrategy language="JAVA" implementationClass="com.intellij.psi.formatter.JavadocWhiteSpaceFormattingStrategy"/> <lang.rearranger language="JAVA" implementationClass="com.intellij.psi.codeStyle.arrangement.JavaRearranger"/> - + <lang.documentationProvider language="JAVA" implementationClass="com.intellij.lang.java.JavaDocumentationProvider"/> <documentationProvider implementation="com.intellij.lang.java.FileDocumentationProvider" order="last"/> <lang.documentationFixer language="JAVA" implementationClass="com.intellij.codeInsight.documentation.JavaDocCommentFixer"/> @@ -1130,6 +1128,7 @@ <!-- <favoritesListProvider implementation="com.intellij.ide.favoritesTreeView.ProjectDefaultFavoriteListProvider"/> --> <!-- <favoritesListProvider implementation="com.intellij.ide.favoritesTreeView.TaskDefaultFavoriteListProvider"/> --> <favoritesListProvider implementation="com.intellij.ide.bookmarks.BookmarksFavoriteListProvider"/> + <favoritesListProvider implementation="com.intellij.debugger.ui.breakpoints.BreakpointsFavoriteListProvider"/> <configurationType implementation="com.intellij.execution.applet.AppletConfigurationType"/> <configurationProducer implementation="com.intellij.execution.applet.AppletConfigurationProducer"/> @@ -1412,7 +1411,7 @@ <action id="ShowProjectStructureSettings" class="com.intellij.ide.actions.ShowStructureSettingsAction" icon="AllIcons.General.ProjectStructure"> <add-to-group group-id="FileMainSettingsGroup" anchor="after" relative-to-action="ShowSettings"/> - <add-to-group group-id="MainToolBar" anchor="after" relative-to-action="ShowSettings"/> + <add-to-group group-id="MainToolBarSettings" anchor="after" relative-to-action="ShowSettings"/> </action> <action id="TemplateProjectStructure" class="com.intellij.ide.actions.TemplateProjectStructureAction"> <add-to-group group-id="FileSettingsGroup" anchor="last"/> diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml index a94da99860a8..9cebfea990a5 100644 --- a/resources/src/idea/RichPlatformActions.xml +++ b/resources/src/idea/RichPlatformActions.xml @@ -150,8 +150,7 @@ <action internal="true" id="CompilerTest" class="com.intellij.compiler.impl.javaCompiler.api.CompilerPerfTestAction" text="Test Rebuild Performance"/> - <action internal="true" id="GenerateDomModel" class="com.intellij.util.dom.generator.GenerateDomModelAction" - text="Generate Dom Model"/> + <add-to-group group-id="Internal" anchor="last"/> </group> @@ -188,6 +187,7 @@ </group> <action id="ModuleSettings" class="com.intellij.ide.actions.ShowModulePropertiesAction"/> + <action id="OpenModuleSettings" class="com.intellij.ide.actions.OpenModuleSettingsAction" use-shortcut-of="EditSource"/> <group id="MoveModuleToGroup" class="com.intellij.ide.projectView.impl.MoveModuleToGroupTopLevel" popup="true"/> <reference ref="AnalyzeMenu"> @@ -221,9 +221,12 @@ </action> - <reference ref="MoveModuleToGroup"> + <reference ref="OpenModuleSettings"> <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" anchor="first"/> </reference> + <reference ref="MoveModuleToGroup"> + <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" anchor="after" relative-to-action="OpenModuleSettings"/> + </reference> <group id="StructureViewCompileGroup"> <separator/> |