diff options
Diffstat (limited to 'platform/platform-resources')
8 files changed, 38 insertions, 10 deletions
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 1f40bacf983c..7aa76abcd4f8 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -57,6 +57,9 @@ <applicationService serviceInterface="com.intellij.openapi.fileEditor.impl.EditorEmptyTextPainter" serviceImplementation="com.intellij.openapi.fileEditor.impl.EditorEmptyTextPainter" /> + <applicationService serviceInterface="com.intellij.openapi.editor.EditorCopyPasteHelper" + serviceImplementation="com.intellij.openapi.editor.impl.EditorCopyPasteHelperImpl" /> + <applicationService serviceImplementation="com.intellij.openapi.options.ex.IdeConfigurablesGroup"/> <applicationService serviceInterface="com.intellij.diagnostic.ErrorReportConfigurable" @@ -190,7 +193,8 @@ <projectService serviceInterface="com.intellij.openapi.vcs.VcsFileListenerContextHelper" serviceImplementation="com.intellij.openapi.vcs.VcsFileListenerContextHelper"/> - <projectService serviceImplementation="com.intellij.openapi.editor.LazyRangeMarkerFactory"/> + <projectService serviceInterface="com.intellij.openapi.editor.LazyRangeMarkerFactory" + serviceImplementation="com.intellij.openapi.editor.impl.LazyRangeMarkerFactoryImpl"/> <!-- General --> <applicationConfigurable groupId="appearance" key="title.general" bundle="messages.IdeBundle" id="preferences.general" instance="com.intellij.ide.GeneralSettingsConfigurable"/> diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml index 9a737df77ef6..525ea3c94540 100644 --- a/platform/platform-resources/src/META-INF/XmlPlugin.xml +++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml @@ -89,6 +89,10 @@ </extensionPoint> <extensionPoint name="xml.undefinedElementFixProvider" interface="com.intellij.xml.XmlUndefinedElementFixProvider"/> + + <extensionPoint qualifiedName="org.jetbrains.webServerPathHandler" interface="org.jetbrains.builtInWebServer.WebServerPathHandler"/> + <extensionPoint qualifiedName="org.jetbrains.webServerFileHandler" interface="org.jetbrains.builtInWebServer.WebServerFileHandler"/> + <extensionPoint qualifiedName="org.jetbrains.webServerRootsProvider" interface="org.jetbrains.builtInWebServer.WebServerRootsProvider"/> </extensionPoints> <project-components> @@ -530,8 +534,21 @@ <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"/> + + <httpRequestHandler implementation="org.jetbrains.builtInWebServer.BuiltInWebServer"/> + <webBrowserUrlProvider implementation="org.jetbrains.builtInWebServer.BuiltInWebBrowserUrlProvider"/> + + <customPortServerManager implementation="org.jetbrains.builtInWebServer.BuiltInServerOptions$MyCustomPortServerManager"/> + <xdebugger.configurableProvider implementation="org.jetbrains.builtInWebServer.BuiltInServerOptions$BuiltInServerDebuggerConfigurableProvider"/> + + <exportable serviceInterface="org.jetbrains.builtInWebServer.BuiltInServerOptions"/> + <applicationService serviceInterface="org.jetbrains.builtInWebServer.BuiltInServerOptions" serviceImplementation="org.jetbrains.builtInWebServer.BuiltInServerOptions"/> + <projectService serviceInterface="org.jetbrains.builtInWebServer.WebServerPathToFileManager" serviceImplementation="org.jetbrains.builtInWebServer.WebServerPathToFileManager"/> </extensions> <extensions defaultExtensionNs="org.jetbrains"> <urlOpener implementation="com.intellij.ide.browsers.impl.DefaultUrlOpener" order="last"/> + <webServerPathHandler implementation="org.jetbrains.builtInWebServer.DefaultWebServerPathHandler"/> + <webServerFileHandler implementation="org.jetbrains.builtInWebServer.BuiltInWebServer$StaticFileHandler" order="last"/> + <webServerRootsProvider implementation="org.jetbrains.builtInWebServer.DefaultWebServerRootsProvider"/> </extensions> </idea-plugin> diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml index 68111b8eb7b2..4b03978f9473 100644 --- a/platform/platform-resources/src/META-INF/xdebugger.xml +++ b/platform/platform-resources/src/META-INF/xdebugger.xml @@ -10,6 +10,7 @@ <extensionPoint name="xdebugger.settings" interface="com.intellij.xdebugger.settings.XDebuggerSettings"/> <extensionPoint name="xdebugger.breakpointType" interface="com.intellij.xdebugger.breakpoints.XBreakpointType"/> <extensionPoint name="xdebugger.debuggerSupport" interface="com.intellij.xdebugger.impl.DebuggerSupport"/> + <extensionPoint name="xdebugger.configurableProvider" interface="com.intellij.xdebugger.settings.DebuggerConfigurableProvider"/> </extensionPoints> <extensions defaultExtensionNs="com.intellij"> @@ -29,11 +30,12 @@ <projectService serviceInterface="com.intellij.xdebugger.impl.XDebuggerHistoryManager" serviceImplementation="com.intellij.xdebugger.impl.XDebuggerHistoryManager"/> - <applicationConfigurable groupId="build" dynamic="true" key="debugger.configurable.display.name" bundle="messages.XDebuggerBundle" provider="com.intellij.xdebugger.impl.settings.DebuggerConfigurableProvider"/> + <applicationConfigurable groupId="build" dynamic="true" key="debugger.configurable.display.name" bundle="messages.XDebuggerBundle" instance="com.intellij.xdebugger.impl.settings.DebuggerConfigurable"/> <customizableActionGroupProvider implementation="com.intellij.xdebugger.impl.ui.XDebugTabCustomizableActionGroupProvider"/> <xdebugger.debuggerSupport implementation="com.intellij.xdebugger.impl.XDebuggerSupport" order="first"/> + <xdebugger.configurableProvider implementation="com.intellij.xdebugger.impl.settings.XDebuggerConfigurableProvider" order="first"/> <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 438c23f2ffd2..57b863fb916b 100644 --- a/platform/platform-resources/src/brokenPlugins.txt +++ b/platform/platform-resources/src/brokenPlugins.txt @@ -1,15 +1,14 @@ // 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.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 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.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 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 -Pythonid 3.1 +org.jetbrains.plugins.ruby 6.0.0.20140207 6.5.2.20140512 7.0.0.20140704 7.0.0.20140707 +Pythonid 3.1 4.0.25 Karma 138.21 134.1163 134.1039 134.686 134.31 -org.intellij.scala 0.32.593 0.32.562 0.32.558 0.32.550 0.32.520 0.32.512 +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.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 diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml index 58d6f3a76d27..3508b1d0112e 100644 --- a/platform/platform-resources/src/idea/Keymap_Default.xml +++ b/platform/platform-resources/src/idea/Keymap_Default.xml @@ -506,6 +506,9 @@ <action id="EditorPasteFromX11"> <mouse-shortcut keystroke="button2"/> </action> + <action id="Vcs.RollbackChangedLines"> + <keyboard-shortcut first-keystroke="control alt Z"/> + </action> <action id="GotoNextError"> <keyboard-shortcut first-keystroke="F2"/> diff --git a/platform/platform-resources/src/idea/Keymap_EclipseMac.xml b/platform/platform-resources/src/idea/Keymap_EclipseMac.xml index dc1dcb5e66ec..f35e24c776b0 100644 --- a/platform/platform-resources/src/idea/Keymap_EclipseMac.xml +++ b/platform/platform-resources/src/idea/Keymap_EclipseMac.xml @@ -312,6 +312,10 @@ <keyboard-shortcut first-keystroke="meta 3"/> </action> + <action id="Vcs.RollbackChangedLines"> + <keyboard-shortcut first-keystroke="control shift alt Z"/> + </action> + <action id="ActivateProjectToolWindow"/> <action id="ActivateFavoritesToolWindow"/> <action id="ActivateFindToolWindow"> diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index 9cebd282ded6..869a8a754886 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -563,7 +563,6 @@ </group> <group id="DiffPanel.Toolbar"> - <reference ref="$Copy"/> <reference ref="PreviousDiff"/> <reference ref="NextDiff"/> <separator/> diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml index dc15f19282bf..5496ab6bf3e7 100644 --- a/platform/platform-resources/src/idea/VcsActions.xml +++ b/platform/platform-resources/src/idea/VcsActions.xml @@ -265,7 +265,7 @@ <add-to-group group-id="CloseEditorsGroup" anchor="before" relative-to-action="CloseAllUnpinnedEditors"/> </action> - <action id="RollbackLineStatusChanges" class="com.intellij.openapi.vcs.ex.RollbackLineStatusAction"> + <action id="Vcs.RollbackChangedLines" class="com.intellij.openapi.vcs.ex.RollbackLineStatusAction" icon="AllIcons.Actions.Reset"> </action> <action id="WelcomeScreen.GetFromVcs" class="com.intellij.openapi.wm.impl.welcomeScreen.GetFromVcsAction" |