diff options
Diffstat (limited to 'platform/platform-resources/src')
11 files changed, 30 insertions, 25 deletions
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index aaae5ddfab28..c338dac9848b 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -166,8 +166,7 @@ <applicationService serviceInterface="com.intellij.util.download.DownloadableFileService" serviceImplementation="com.intellij.util.download.impl.DownloadableFileServiceImpl"/> - <applicationService serviceInterface="com.intellij.psi.impl.DocumentCommitThread" - serviceImplementation="com.intellij.psi.impl.DocumentCommitThread"/> + <applicationService serviceImplementation="com.intellij.psi.impl.DocumentCommitThread"/> <applicationService serviceInterface="com.intellij.psi.stubs.StubTreeLoader" serviceImplementation="com.intellij.psi.stubs.StubTreeLoaderImpl"/> @@ -614,7 +613,7 @@ <editorCustomization implementation="com.intellij.ui.RightMarginEditorCustomization"/> <!-- Colors & Fonts--> - <editorOptionsProvider instance="com.intellij.application.options.colors.ColorAndFontOptions" + <applicationConfigurable groupId="editor" dynamic="true" instance="com.intellij.application.options.colors.ColorAndFontOptions" id="reference.settingsdialog.IDE.editor.colors"/> <editorOptionsProvider instance="com.intellij.application.options.editor.EditorTabsConfigurable" id="editor.preferences.tabs" displayName="Editor Tabs"/> @@ -652,6 +651,7 @@ <editorActionHandler action="EditorEnter" implementationClass="com.intellij.codeInsight.editorActions.EnterHandler" id="editorEnter"/> <editorActionHandler action="EditorLineEnd" implementationClass="com.intellij.codeInsight.editorActions.EndHandler"/> <editorActionHandler action="EditorSelectWord" implementationClass="com.intellij.codeInsight.editorActions.SelectWordHandler"/> + <editorActionHandler action="EditorSelectWord" implementationClass="com.intellij.openapi.editor.actions.SelectWordAtCaretAction$Handler" order="first"/> <editorActionHandler action="EditorUnSelectWord" implementationClass="com.intellij.codeInsight.editorActions.UnSelectWordHandler"/> <editorActionHandler action="EditorPaste" implementationClass="com.intellij.codeInsight.editorActions.PasteHandler"/> <editorActionHandler action="EditorCopy" implementationClass="com.intellij.codeInsight.editorActions.CopyHandler"/> @@ -825,7 +825,7 @@ <defaultHighlightingSettingProvider implementation="com.intellij.codeInsight.daemon.impl.analysis.GeneratedSourcesHighlightingSettingProvider"/> <editorNotificationProvider implementation="com.intellij.ide.GeneratedFileEditingNotificationProvider"/> - <editorTabTitleProvider implementation="com.intellij.openapi.fileEditor.impl.UniqueNameEditorTabTitleProvider"/> + <editorTabTitleProvider implementation="com.intellij.openapi.fileEditor.impl.UniqueNameEditorTabTitleProvider" order="last"/> <projectService serviceInterface="com.intellij.psi.util.PsiModificationTracker" serviceImplementation="com.intellij.psi.impl.PsiModificationTrackerImpl"/> @@ -889,6 +889,8 @@ <editorOptionsProvider id="editing.postfixCompletion" instance="com.intellij.codeInsight.template.postfix.settings.PostfixTemplatesConfigurable"/> <completion.contributor language="any" implementationClass="com.intellij.codeInsight.template.postfix.completion.PostfixTemplateCompletionContributor"/> + <projectService serviceInterface="com.intellij.execution.ExecutionManager" serviceImplementation="com.intellij.execution.impl.ExecutionManagerImpl"/> + <projectService serviceInterface="com.intellij.execution.ExecutionTargetManager" serviceImplementation="com.intellij.execution.ExecutionTargetManagerImpl"/> </extensions> </idea-plugin> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml index e8a45edbf138..a4dfd49a71a8 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml @@ -230,6 +230,8 @@ <with attribute="implementationClass" implements="com.intellij.codeInsight.template.postfix.templates.PostfixTemplateProvider"/> </extensionPoint> + <extensionPoint name="editor.linePainter" interface="com.intellij.openapi.editor.EditorLinePainter"/> + <extensionPoint name="actionFromOptionDescriptorProvider" interface="com.intellij.ide.ui.search.ActionFromOptionDescriptorProvider"/> </extensionPoints> </idea-plugin> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 7aa76abcd4f8..467ef8233919 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -239,6 +239,10 @@ <applicationService serviceInterface="com.intellij.ui.ColorChooserService" serviceImplementation="com.intellij.ui.ColorChooserServiceImpl"/> + <applicationService serviceInterface="com.intellij.openapi.actionSystem.AbbreviationManager" + serviceImplementation="com.intellij.openapi.actionSystem.impl.AbbreviationManagerImpl"/> + <exportable serviceInterface="com.intellij.openapi.actionSystem.AbbreviationManager"/> + <scopeParserExtension implementation="com.intellij.psi.search.scope.packageSet.FilePackageSetParserExtension"/> <applicationService serviceInterface="com.intellij.openapi.ui.popup.StackingPopupDispatcher" serviceImplementation="com.intellij.ui.popup.StackingPopupDispatcherImpl"/> diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml index b7a11c39ecae..ea14882e5ae6 100644 --- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml +++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml @@ -101,5 +101,8 @@ <xi:include href="/META-INF/vcs-log-graph.xml" xpointer="xpointer(/idea-plugin/*)"> <xi:fallback/> </xi:include> + <xi:include href="/META-INF/dvcs.xml" xpointer="xpointer(/idea-plugin/*)"> + <xi:fallback/> + </xi:include> </idea-plugin> diff --git a/platform/platform-resources/src/META-INF/PlatformPlugin.xml b/platform/platform-resources/src/META-INF/PlatformPlugin.xml index db1cae3e76aa..773b00c2b9f2 100644 --- a/platform/platform-resources/src/META-INF/PlatformPlugin.xml +++ b/platform/platform-resources/src/META-INF/PlatformPlugin.xml @@ -10,6 +10,9 @@ <xi:include href="/META-INF/vcs-log-graph.xml" xpointer="xpointer(/idea-plugin/*)"> <xi:fallback/> </xi:include> + <xi:include href="/META-INF/dvcs.xml" xpointer="xpointer(/idea-plugin/*)"> + <xi:fallback/> + </xi:include> <extensionPoints> <xi:include href="/META-INF/PlatformExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/> diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml index 4b03978f9473..4dde33287f0c 100644 --- a/platform/platform-resources/src/META-INF/xdebugger.xml +++ b/platform/platform-resources/src/META-INF/xdebugger.xml @@ -36,6 +36,7 @@ <xdebugger.debuggerSupport implementation="com.intellij.xdebugger.impl.XDebuggerSupport" order="first"/> <xdebugger.configurableProvider implementation="com.intellij.xdebugger.impl.settings.XDebuggerConfigurableProvider" order="first"/> + <editor.linePainter implementation="com.intellij.xdebugger.impl.evaluate.XDebuggerEditorLinePainter"/> <executor implementation="com.intellij.execution.executors.DefaultDebugExecutor" order="first,after run"/> </extensions> diff --git a/platform/platform-resources/src/brokenPlugins.txt b/platform/platform-resources/src/brokenPlugins.txt index 57b863fb916b..7b0830e86b02 100644 --- a/platform/platform-resources/src/brokenPlugins.txt +++ b/platform/platform-resources/src/brokenPlugins.txt @@ -1,18 +1,19 @@ // This file contains list of broken plugins. // Each line contains plugin ID and list of versions that are broken. // If plugin name or version contains a space you can quote it like in command line. -NodeJS 138.937 138.1013 138.921 138.447 138.172 138.317 138.21 138.35 138.96 138.85 136.1205 134.1276 134.1163 134.1145 134.1081 134.1039 134.985 134.680 134.31 134.307 134.262 134.198 134.125 136.1141 -com.jetbrains.php 138.826 136.1768 136.1672 134.1456 133.982 133.679 133.51 133.326 131.98 131.374 131.332 131.235 131.205 130.1639 130.1481 130.1176 129.91 129.814 129.672 129.362 127.67 127.100 126.334 123.66 122.875 121.62 121.390 121.215 121.12 +NodeJS 138.1189 138.1145 138.937 138.1013 138.921 138.447 138.172 138.317 138.21 138.35 138.96 138.85 136.1205 134.1276 134.1163 134.1145 134.1081 134.1039 134.985 134.680 134.31 134.307 134.262 134.198 134.125 136.1141 +com.jetbrains.php 138.1161 138.826 136.1768 136.1672 134.1456 133.982 133.679 133.51 133.326 131.98 131.374 131.332 131.235 131.205 130.1639 130.1481 130.1176 129.91 129.814 129.672 129.362 127.67 127.100 126.334 123.66 122.875 121.62 121.390 121.215 121.12 com.jetbrains.lang.ejs 131.17 131.12 com.jetbrains.twig 133.51 130.1639 -org.jetbrains.plugins.ruby 6.0.0.20140207 6.5.2.20140512 7.0.0.20140704 7.0.0.20140707 +org.jetbrains.plugins.ruby 6.0.0.20140207 6.5.2.20140512 7.0.0.20140704 7.0.0.20140707 7.0.0.20140724 Pythonid 3.1 4.0.25 Karma 138.21 134.1163 134.1039 134.686 134.31 -org.intellij.scala 0.40.20 0.40.18 0.40.16 0.32.593 0.32.562 0.32.558 0.32.550 0.32.520 0.32.512 +org.intellij.scala 0.42.23 0.40.20 0.40.18 0.40.16 0.32.593 0.32.562 0.32.558 0.32.550 0.32.520 0.32.512 org.jetbrains.kannotator 0.2.420 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 -org.intellij.clojure 0.2.1.178
\ No newline at end of file +org.intellij.clojure 0.2.1.178 +net.nicoulaj.idea.markdown 0.9.6 0.9.5 0.9.4 0.9.3 0.9.2 0.9.1 0.8.3 0.8.2 0.8.1 0.8 0.7 0.6.1 0.6 0.5.1 0.5 0.4 0.3 0.2 0.1 diff --git a/platform/platform-resources/src/componentSets/Execution.xml b/platform/platform-resources/src/componentSets/Execution.xml index 829135bbb0b2..6f548daa692b 100644 --- a/platform/platform-resources/src/componentSets/Execution.xml +++ b/platform/platform-resources/src/componentSets/Execution.xml @@ -18,17 +18,7 @@ <loadForDefaultProject/> </component> <component> - <interface-class>com.intellij.execution.ExecutionTargetManager</interface-class> - <implementation-class>com.intellij.execution.ExecutionTargetManagerImpl</implementation-class> - <option name="workspace" value="true"/> - <loadForDefaultProject/> - </component> - <component> <implementation-class>com.intellij.execution.impl.ProjectRunConfigurationManager</implementation-class> </component> - <component> - <interface-class>com.intellij.execution.ExecutionManager</interface-class> - <implementation-class>com.intellij.execution.impl.ExecutionManagerImpl</implementation-class> - </component> </project-components> -</components>
\ No newline at end of file +</components> diff --git a/platform/platform-resources/src/componentSets/UICore.xml b/platform/platform-resources/src/componentSets/UICore.xml index 8d7d5d63e055..6d2b09835c8c 100644 --- a/platform/platform-resources/src/componentSets/UICore.xml +++ b/platform/platform-resources/src/componentSets/UICore.xml @@ -14,10 +14,6 @@ <headless-implementation-class>com.intellij.idea.CommandLineApplication$MyDataManagerImpl</headless-implementation-class> </component> <component> - <interface-class>com.intellij.openapi.actionSystem.AbbreviationManager</interface-class> - <implementation-class>com.intellij.openapi.actionSystem.impl.AbbreviationManagerImpl</implementation-class> - </component> - <component> <interface-class>com.intellij.openapi.actionSystem.ActionManager</interface-class> <implementation-class>com.intellij.openapi.actionSystem.impl.ActionManagerImpl</implementation-class> </component> diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 65fa309fe3b9..3b0289f12433 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -364,6 +364,7 @@ <separator/> <reference id="NavBarToolBarOthers"/> <separator/> + <reference ref="SearchEverywhere"/> </group> <group id="Bookmarks"> @@ -697,6 +698,7 @@ </group> <group id="XDebugger.ToolWindow.LeftToolbar"> + <reference ref="Rerun"/> <reference ref="Resume"/> <reference ref="Pause"/> <reference ref="Stop"/> diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index 869a8a754886..7773a2b00e49 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -457,6 +457,7 @@ </group> <separator/> <reference ref="HelpTopics"/> + <reference ref="SearchEverywhere"/> </group> <group id="NavBarVcsGroup"/> @@ -580,8 +581,8 @@ <action id="MaintenanceAction" class="com.intellij.ide.actions.MaintenanceAction"/> <group id="MaintenanceGroup"> - <action id="UiDebugger" class="com.intellij.ui.debugger.ShowUiDebuggerAction"/> <action id="ShowRegistry" class="com.intellij.openapi.util.registry.ShowRegistryAction"/> + <action id="UiDebugger" class="com.intellij.ui.debugger.ShowUiDebuggerAction"/> </group> <action id="Console.Execute" class="com.intellij.openapi.actionSystem.EmptyAction"/> |