diff options
Diffstat (limited to 'platform/platform-resources/src')
11 files changed, 46 insertions, 34 deletions
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index 0e6680392f94..aaae5ddfab28 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -361,25 +361,25 @@ serviceImplementation="com.intellij.codeInspection.ex.ProjectInspectionProfilesVisibleTreeState"/> <!-- Editor --> - <applicationConfigurable instance="com.intellij.application.options.editor.EditorOptions" id="editor" key="title.editor" + <applicationConfigurable groupId="editor" instance="com.intellij.application.options.editor.EditorOptions" id="editor" key="title.editor" bundle="messages.ApplicationBundle" order="after appearance" childrenEPName="com.intellij.editorOptionsProvider"/> <projectService serviceInterface="com.intellij.semantic.SemService" serviceImplementation="com.intellij.semantic.SemServiceImpl"/> <!-- Global Code Style --> - <projectConfigurable instance="com.intellij.application.options.CodeStyleSchemesConfigurable" order="after colors"/> + <projectConfigurable groupId="editor" dynamic="true" displayName="Code Style" instance="com.intellij.application.options.CodeStyleSchemesConfigurable" order="after colors"/> <applicationService serviceInterface="com.intellij.application.options.codeStyle.CodeStyleSchemesUIConfiguration" serviceImplementation="com.intellij.application.options.codeStyle.CodeStyleSchemesUIConfiguration"/> <!-- File Types --> - <applicationConfigurable instance="com.intellij.openapi.fileTypes.impl.FileTypeConfigurable" id="preferences.fileTypes" + <applicationConfigurable groupId="editor" instance="com.intellij.openapi.fileTypes.impl.FileTypeConfigurable" id="preferences.fileTypes" key="filetype.settings.title" bundle="messages.FileTypesBundle"/> - <applicationConfigurable instance="com.intellij.codeInsight.intention.impl.config.IntentionSettingsConfigurable" id="intentions"/> + <applicationConfigurable groupId="editor" key="intention.settings" bundle="messages.CodeInsightBundle" instance="com.intellij.codeInsight.intention.impl.config.IntentionSettingsConfigurable" id="intentions"/> <!-- Live Templates --> - <applicationConfigurable instance="com.intellij.codeInsight.template.impl.LiveTemplatesConfigurable" id="editing.templates" + <applicationConfigurable groupId="editor" instance="com.intellij.codeInsight.template.impl.LiveTemplatesConfigurable" id="editing.templates" key="templates.settings.page.title" bundle="messages.CodeInsightBundle"/> <lookup.actionProvider implementation="com.intellij.codeInsight.template.impl.LiveTemplateLookupActionProvider"/> <documentationProvider implementation="com.intellij.codeInsight.template.impl.LiveTemplateDocumentationProvider"/> @@ -387,15 +387,15 @@ serviceImplementation="com.intellij.codeInsight.template.impl.TemplateManagerImpl"/> <!-- File Templates--> - <applicationConfigurable instance="com.intellij.ide.fileTemplates.impl.AllFileTemplatesConfigurable" id="fileTemplates" + <applicationConfigurable groupId="editor" instance="com.intellij.ide.fileTemplates.impl.AllFileTemplatesConfigurable" id="fileTemplates" key="title.file.templates" bundle="messages.IdeBundle"/> <!-- T.O.D.O --> - <applicationConfigurable instance="com.intellij.ide.todo.configurable.TodoConfigurable" id="preferences.toDoOptions" key="title.todo" + <applicationConfigurable groupId="editor" instance="com.intellij.ide.todo.configurable.TodoConfigurable" id="preferences.toDoOptions" key="title.todo" bundle="messages.IdeBundle"/> <!-- External Tools --> - <applicationConfigurable instance="com.intellij.tools.ToolConfigurable" id="preferences.externalTools" key="tools.settings.title" + <applicationConfigurable groupId="tools" instance="com.intellij.tools.ToolConfigurable" id="preferences.externalTools" key="tools.settings.title" bundle="messages.ToolsBundle"/> <stepsBeforeRunProvider implementation="com.intellij.tools.ToolBeforeRunTaskProvider"/> <checkinHandlerFactory implementation="com.intellij.tools.ExternalToolsCheckinHandlerFactory"/> @@ -551,6 +551,8 @@ <customPasteProvider implementation="com.intellij.ide.actions.PasteReferenceProvider"/> + <referenceInjector implementation="com.intellij.codeInsight.daemon.impl.analysis.encoding.EncodingReferenceInjector"/> + <usageFilteringRuleProvider implementation="com.intellij.usages.impl.UsageFilteringRuleProviderImpl"/> <usageGroupingRuleProvider implementation="com.intellij.usages.impl.UsageGroupingRuleProviderImpl"/> @@ -751,8 +753,8 @@ <psi.fileReferenceHelper implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.HttpFileReferenceHelper"/> <psi.fileReferenceHelper implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.NullFileReferenceHelper" order="last"/> - <projectConfigurable instance="com.intellij.openapi.vfs.encoding.FileEncodingConfigurable"/> - <projectConfigurable instance="com.intellij.ui.tabs.FileColorsConfigurable" id="fileColors" displayName="File Colors"/> + <projectConfigurable groupId="editor" key="file.encodings.configurable" bundle="messages.IdeBundle" instance="com.intellij.openapi.vfs.encoding.FileEncodingConfigurable"/> + <projectConfigurable groupId="appearance" instance="com.intellij.ui.tabs.FileColorsConfigurable" id="fileColors" displayName="File Colors"/> <uiDebuggerExtension implementation="com.intellij.ui.debugger.extensions.PlaybackDebugger"/> <uiDebuggerExtension implementation="com.intellij.ui.debugger.extensions.ActionTracer"/> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml index 61ee24ebe543..e8a45edbf138 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml @@ -12,6 +12,9 @@ <extensionPoint name="errorHandler" interface="com.intellij.openapi.diagnostic.ErrorReportSubmitter"/> + <extensionPoint name="jps.plugin" + beanClass="com.intellij.jps.impl.JpsPluginBean"/> + <extensionPoint name="codeInsight.containerProvider" interface="com.intellij.codeInsight.ContainerProvider"/> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 851a91d314ab..1f40bacf983c 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -124,7 +124,7 @@ serviceImplementation="com.intellij.ide.passwordSafe.config.PasswordSafeSettings"/> <applicationService serviceInterface="com.intellij.ide.passwordSafe.PasswordSafe" serviceImplementation="com.intellij.ide.passwordSafe.impl.PasswordSafeImpl"/> - <applicationConfigurable instance="com.intellij.ide.passwordSafe.config.PasswordSafeConfigurable" id="application.passwordSafe" + <applicationConfigurable parentId="preferences.general" instance="com.intellij.ide.passwordSafe.config.PasswordSafeConfigurable" id="application.passwordSafe" displayName="Passwords"/> <applicationService serviceInterface="com.intellij.execution.process.ColoredOutputTypeRegistry" serviceImplementation="com.intellij.execution.process.ColoredOutputTypeRegistry"/> @@ -193,32 +193,32 @@ <projectService serviceImplementation="com.intellij.openapi.editor.LazyRangeMarkerFactory"/> <!-- General --> - <applicationConfigurable instance="com.intellij.ide.GeneralSettingsConfigurable"/> + <applicationConfigurable groupId="appearance" key="title.general" bundle="messages.IdeBundle" id="preferences.general" instance="com.intellij.ide.GeneralSettingsConfigurable"/> <!-- Appearance --> - <applicationConfigurable instance="com.intellij.ide.ui.AppearanceConfigurable" id="appearance" key="title.appearance" + <applicationConfigurable groupId="appearance" instance="com.intellij.ide.ui.AppearanceConfigurable" id="appearance" key="title.appearance" bundle="messages.IdeBundle"/> <!-- Keymap --> - <applicationConfigurable instance="com.intellij.openapi.keymap.impl.ui.KeymapPanel" id="preferences.keymap" key="keymap.display.name" + <applicationConfigurable groupId="appearance" instance="com.intellij.openapi.keymap.impl.ui.KeymapPanel" id="preferences.keymap" key="keymap.display.name" bundle="messages.KeyMapBundle"/> - <applicationConfigurable instance="com.intellij.openapi.keymap.impl.ui.QuickListsPanel" id="reference.idesettings.quicklists" + <applicationConfigurable parentId="appearance" instance="com.intellij.openapi.keymap.impl.ui.QuickListsPanel" id="reference.idesettings.quicklists" displayName="Quick Lists"/> <!-- Customizations --> - <applicationConfigurable instance="com.intellij.ide.ui.customization.CustomizationConfigurable" id="preferences.customizations" + <applicationConfigurable parentId="appearance" instance="com.intellij.ide.ui.customization.CustomizationConfigurable" id="preferences.customizations" key="title.customizations" bundle="messages.IdeBundle"/> <!-- Notifications --> - <applicationConfigurable instance="com.intellij.notification.impl.NotificationsConfigurable"/> + <applicationConfigurable groupId="appearance" displayName="Notifications" instance="com.intellij.notification.impl.NotificationsConfigurable"/> <!-- Plugins --> - <applicationConfigurable instance="com.intellij.ide.plugins.PluginManagerConfigurable" id="preferences.pluginManager" + <applicationConfigurable groupId="appearance" instance="com.intellij.ide.plugins.PluginManagerConfigurable" id="preferences.pluginManager" displayName="Plugins"/> <actionFromOptionDescriptorProvider implementation="com.intellij.ide.plugins.InstalledPluginsManagerMain$PluginsActionFromOptionDescriptorProvider"/> - <applicationConfigurable instance="com.intellij.util.net.HTTPProxySettingsPanel" id="http.proxy" displayName="HTTP Proxy" /> - <applicationConfigurable instance="com.intellij.util.net.ssl.CertificateConfigurable"/> - <applicationConfigurable instance="com.intellij.openapi.diff.impl.external.DiffOptionsForm" id="diff" displayName="External Diff Tools" /> + <applicationConfigurable parentId="preferences.general" instance="com.intellij.util.net.HTTPProxySettingsPanel" id="http.proxy" displayName="HTTP Proxy" /> + <applicationConfigurable groupId="tools" displayName="Server Certificates" instance="com.intellij.util.net.ssl.CertificateConfigurable"/> + <applicationConfigurable groupId="tools" instance="com.intellij.openapi.diff.impl.external.DiffOptionsForm" id="diff" displayName="External Diff Tools" /> <!--<applicationConfigurable instance="com.intellij.ui.switcher.QuickAccessConfigurable"/>--> <fileTypeFactory implementation="com.intellij.openapi.fileTypes.impl.PlatformFileTypeFactory"/> @@ -226,7 +226,7 @@ <applicationService serviceInterface="com.intellij.openapi.options.colors.ColorSettingsPages" serviceImplementation="com.intellij.openapi.options.colors.pages.ColorSettingsPagesImpl"/> - <applicationConfigurable instance="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable" id="preferences.updates" + <applicationConfigurable parentId="preferences.general" instance="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable" id="preferences.updates" key="updates.settings.title" bundle="messages.IdeBundle"/> <applicationService serviceInterface="com.intellij.psi.search.scope.packageSet.PackageSetFactory" @@ -242,7 +242,7 @@ <componentConfigurationMerger implementation="com.intellij.openapi.vcs.changes.shelf.ShelfManagerConfigurationMerger"/> <editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.hint.EscapeHandler" id="hide-hints"/> - <projectConfigurable instance="com.intellij.javaee.ExternalResourceConfigurable" key="display.name.edit.external.resource" + <projectConfigurable groupId="language" instance="com.intellij.javaee.ExternalResourceConfigurable" key="display.name.edit.external.resource" bundle="messages.XmlBundle" id="preferences.externalResources"> <configurable instance="com.intellij.javaee.XMLCatalogConfigurable" displayName="XML Catalog" id="xml.catalog"/> </projectConfigurable> @@ -262,7 +262,7 @@ <statistics.usagesCollector implementation="com.intellij.internal.statistic.UiInfoUsageCollector"/> <statistics.usagesCollector implementation="com.intellij.internal.statistic.JdkInfoUsageCollector"/> - <applicationConfigurable instance="com.intellij.internal.statistic.configurable.StatisticsConfigurable" id="usage.statistics" + <applicationConfigurable parentId="preferences.general" instance="com.intellij.internal.statistic.configurable.StatisticsConfigurable" id="usage.statistics" displayName="Usage Statistics"/> <virtualFileSystem key="dummy" implementationClass="com.intellij.openapi.vfs.ex.dummy.DummyFileSystem"/> diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml index baee8add1483..b7a11c39ecae 100644 --- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml +++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml @@ -81,8 +81,8 @@ <programRunner implementation="com.intellij.execution.runners.BasicProgramRunner" order="last"/> - <projectConfigurable provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider" order="before intentions"/> - <projectConfigurable instance="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" id="project.scopes" key="scopes.display.name" bundle="messages.IdeBundle" /> + <projectConfigurable groupId="editor" displayName="Inspections" provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider" order="before intentions"/> + <projectConfigurable groupId="project" instance="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" id="project.scopes" key="scopes.display.name" bundle="messages.IdeBundle" /> <checkoutCompletedListener implementation="com.intellij.openapi.vcs.checkout.PlatformProjectCheckoutListener" id="PlatformProjectCheckoutListener"/> diff --git a/platform/platform-resources/src/META-INF/VcsExtensions.xml b/platform/platform-resources/src/META-INF/VcsExtensions.xml index 9d40b359f59b..a05f28107034 100644 --- a/platform/platform-resources/src/META-INF/VcsExtensions.xml +++ b/platform/platform-resources/src/META-INF/VcsExtensions.xml @@ -25,7 +25,7 @@ <selectInTarget implementation="com.intellij.openapi.vcs.changes.SelectInChangesViewTarget"/> - <projectConfigurable instance="com.intellij.openapi.vcs.configurable.VcsManagerConfigurable" id="vcs"/> + <projectConfigurable groupId="project" dynamic="true" key="version.control.main.configurable.name" bundle="messages.VcsBundle" instance="com.intellij.openapi.vcs.configurable.VcsManagerConfigurable" id="vcs"/> <changesViewContent tabName="Repository" className="com.intellij.openapi.vcs.changes.committed.CommittedChangesViewManager" predicateClassName="com.intellij.openapi.vcs.changes.committed.CommittedChangesVisibilityPredicate"/> diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml index 9da1e3317e13..9a737df77ef6 100644 --- a/platform/platform-resources/src/META-INF/XmlPlugin.xml +++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml @@ -182,7 +182,7 @@ serviceImplementation="com.intellij.application.options.editor.WebEditorOptions"/> <exportable serviceInterface="com.intellij.application.options.editor.WebEditorOptions"/> - <applicationConfigurable provider="com.intellij.application.options.emmet.EmmetConfigurableProvider"/> + <applicationConfigurable groupId="editor" key="emmet.configuration.title" bundle="messages.XmlBundle" provider="com.intellij.application.options.emmet.EmmetConfigurableProvider"/> <applicationService serviceInterface="com.intellij.application.options.emmet.EmmetOptions" serviceImplementation="com.intellij.application.options.emmet.EmmetOptions"/> <exportable serviceInterface="com.intellij.application.options.emmet.EmmetOptions"/> @@ -527,7 +527,7 @@ <selectInTarget implementation="com.intellij.ide.browsers.actions.SelectInDefaultBrowserTarget"/> <xml.xmlExtension implementation="com.intellij.xml.HtmlXmlExtension"/> - <applicationConfigurable instance="com.intellij.ide.browsers.BrowserSettings" id="reference.settings.ide.settings.web.browsers" + <applicationConfigurable groupId="tools" instance="com.intellij.ide.browsers.BrowserSettings" id="reference.settings.ide.settings.web.browsers" key="browsers.settings" bundle="messages.IdeBundle"/> <lang.inspectionSuppressor language="XML" implementationClass="com.intellij.codeInspection.XmlInspectionSuppressor"/> </extensions> diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml index 013a4d881a12..68111b8eb7b2 100644 --- a/platform/platform-resources/src/META-INF/xdebugger.xml +++ b/platform/platform-resources/src/META-INF/xdebugger.xml @@ -15,7 +15,7 @@ <extensions defaultExtensionNs="com.intellij"> <colorSettingsPage implementation="com.intellij.xdebugger.impl.ui.DebuggerColorsPage"/> - <applicationService serviceInterface="com.intellij.xdebugger.impl.settings.XDebuggerSettingsManager" + <applicationService serviceInterface="com.intellij.xdebugger.settings.XDebuggerSettingsManager" serviceImplementation="com.intellij.xdebugger.impl.settings.XDebuggerSettingsManager"/> <applicationService serviceInterface="com.intellij.xdebugger.XDebuggerUtil" @@ -29,7 +29,7 @@ <projectService serviceInterface="com.intellij.xdebugger.impl.XDebuggerHistoryManager" serviceImplementation="com.intellij.xdebugger.impl.XDebuggerHistoryManager"/> - <applicationConfigurable provider="com.intellij.xdebugger.impl.settings.DebuggerConfigurableProvider"/> + <applicationConfigurable groupId="build" dynamic="true" key="debugger.configurable.display.name" bundle="messages.XDebuggerBundle" provider="com.intellij.xdebugger.impl.settings.DebuggerConfigurableProvider"/> <customizableActionGroupProvider implementation="com.intellij.xdebugger.impl.ui.XDebugTabCustomizableActionGroupProvider"/> diff --git a/platform/platform-resources/src/brokenPlugins.txt b/platform/platform-resources/src/brokenPlugins.txt index d5678fdd8977..438c23f2ffd2 100644 --- a/platform/platform-resources/src/brokenPlugins.txt +++ b/platform/platform-resources/src/brokenPlugins.txt @@ -15,4 +15,5 @@ org.jetbrains.kotlin 0.7.1360 0.7.1376 0.8.7 SBT 1.0.0 1.1.0 1.2.0 1.3.0 1.3.1 1.4.0 1.5.0 "JSTestDriver Plugin" 138.21 136.1141 134.1163 134.686 134.31 134.307 134.1039 AngularJS 134.1094 0.1.8 0.1.9 -org.jetbrains.plugins.vagrant 0.1 0.2
\ No newline at end of file +org.jetbrains.plugins.vagrant 0.1 0.2 +org.intellij.clojure 0.2.1.178
\ No newline at end of file diff --git a/platform/platform-resources/src/componentSets/Lang.xml b/platform/platform-resources/src/componentSets/Lang.xml index bd3879e67a90..89a9b361a4f0 100644 --- a/platform/platform-resources/src/componentSets/Lang.xml +++ b/platform/platform-resources/src/componentSets/Lang.xml @@ -37,6 +37,7 @@ <component> <implementation-class>com.intellij.codeInsight.preview.ImageOrColorPreviewManager</implementation-class> </component> + </application-components> <project-components> @@ -203,7 +204,8 @@ </component> <component> - <implementation-class>com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater</implementation-class> + <interface-class>com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater</interface-class> + <implementation-class>com.intellij.openapi.roots.impl.PushedFilePropertiesUpdaterImpl</implementation-class> </component> <component> @@ -225,6 +227,7 @@ <interface-class>com.intellij.ide.GeneratedSourceFileChangeTracker</interface-class> <implementation-class>com.intellij.ide.GeneratedSourceFileChangeTrackerImpl</implementation-class> </component> + </project-components> <module-components> diff --git a/platform/platform-resources/src/idea/PlatformLangActionManager.xml b/platform/platform-resources/src/idea/PlatformLangActionManager.xml index c5d83d776ce4..a5431feb2538 100644 --- a/platform/platform-resources/src/idea/PlatformLangActionManager.xml +++ b/platform/platform-resources/src/idea/PlatformLangActionManager.xml @@ -42,7 +42,7 @@ <group id="InspectCodeGroup"> <separator/> <action id="InspectCode" class="com.intellij.codeInspection.actions.CodeInspectionAction"/> - <action id="CodeCleanup" class="com.intellij.codeInspection.actions.CodeCleanupAction" internal="true"/> + <action id="CodeCleanup" class="com.intellij.codeInspection.actions.CodeCleanupAction"/> <action id="RunInspection" class="com.intellij.codeInspection.actions.RunInspectionAction" /> <action id="PopupHector" class="com.intellij.codeInsight.daemon.impl.PopupHectorAction"/> <action id="ViewOfflineInspection" class="com.intellij.codeInspection.actions.ViewOfflineResultsAction"/> diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml index 935bcc7b4df8..dc15f19282bf 100644 --- a/platform/platform-resources/src/idea/VcsActions.xml +++ b/platform/platform-resources/src/idea/VcsActions.xml @@ -265,6 +265,9 @@ <add-to-group group-id="CloseEditorsGroup" anchor="before" relative-to-action="CloseAllUnpinnedEditors"/> </action> + <action id="RollbackLineStatusChanges" class="com.intellij.openapi.vcs.ex.RollbackLineStatusAction"> + </action> + <action id="WelcomeScreen.GetFromVcs" class="com.intellij.openapi.wm.impl.welcomeScreen.GetFromVcsAction" icon="AllIcons.General.GetProjectfromVCS"> <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/> |