diff options
Diffstat (limited to 'platform/platform-resources/src')
10 files changed, 28 insertions, 43 deletions
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index dcdc0e2d983c..2e2e0c80bb17 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -385,7 +385,8 @@ interface="com.intellij.execution.configurations.ConfigurationType"/> <extensionPoint name="runConfigurationsSettings" - interface="com.intellij.execution.configurations.RunConfigurationsSettings"/> + interface="com.intellij.execution.configurations.RunConfigurationsSettings" + area="IDEA_PROJECT"/> <extensionPoint name="programRunner" interface="com.intellij.execution.runners.ProgramRunner"/> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml index baea70a67c7a..00bd38430d68 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml @@ -10,7 +10,7 @@ interface="com.intellij.openapi.startup.StartupActivity"/> <extensionPoint name="defaultProjectTypeProvider" - interface="com.intellij.openapi.project.DefaultProjectTypeProvider"/> + beanClass="com.intellij.openapi.project.DefaultProjectTypeEP"/> <extensionPoint name="errorHandler" interface="com.intellij.openapi.diagnostic.ErrorReportSubmitter"/> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 51028d93edac..29dcf0645cef 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -151,6 +151,9 @@ <applicationService serviceImplementation="com.intellij.internal.statistic.UsageTrigger"/> + <applicationService serviceInterface="com.intellij.openapi.application.PathMacros" + serviceImplementation="com.intellij.application.options.PathMacrosImpl"/> + <projectService serviceInterface="com.intellij.openapi.vfs.ReadonlyStatusHandler" serviceImplementation="com.intellij.openapi.vcs.readOnlyHandler.ReadonlyStatusHandlerImpl"/> <projectService serviceInterface="com.intellij.openapi.startup.StartupManager" diff --git a/platform/platform-resources/src/META-INF/VcsExtensions.xml b/platform/platform-resources/src/META-INF/VcsExtensions.xml index 2322381c3b89..37fddfafbead 100644 --- a/platform/platform-resources/src/META-INF/VcsExtensions.xml +++ b/platform/platform-resources/src/META-INF/VcsExtensions.xml @@ -25,7 +25,8 @@ <selectInTarget implementation="com.intellij.openapi.vcs.changes.SelectInChangesViewTarget"/> - <projectConfigurable groupId="project" groupWeight="110" dynamic="true" key="version.control.main.configurable.name" bundle="messages.VcsBundle" instance="com.intellij.openapi.vcs.configurable.VcsManagerConfigurable" id="vcs"/> + <projectConfigurable groupId="root" groupWeight="45" dynamic="true" key="version.control.main.configurable.name" bundle="messages.VcsBundle" + provider="com.intellij.openapi.vcs.configurable.VcsManagerConfigurableProvider" 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 566d674d0063..b6653d81eec7 100644 --- a/platform/platform-resources/src/META-INF/XmlPlugin.xml +++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml @@ -548,7 +548,7 @@ </extensions> <extensions defaultExtensionNs="org.jetbrains"> <urlOpener implementation="com.intellij.ide.browsers.impl.DefaultUrlOpener" order="last"/> - <webServerPathHandler implementation="org.jetbrains.builtInWebServer.DefaultWebServerPathHandler"/> + <webServerPathHandler implementation="org.jetbrains.builtInWebServer.DefaultWebServerPathHandler" order="last"/> <webServerFileHandler implementation="org.jetbrains.builtInWebServer.BuiltInWebServer$StaticFileHandler" order="last"/> <webServerRootsProvider implementation="org.jetbrains.builtInWebServer.DefaultWebServerRootsProvider"/> </extensions> diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml index d28921d17ba6..821cb528b6a9 100644 --- a/platform/platform-resources/src/META-INF/xdebugger.xml +++ b/platform/platform-resources/src/META-INF/xdebugger.xml @@ -30,7 +30,8 @@ <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" instance="com.intellij.xdebugger.impl.settings.DebuggerConfigurable"/> + <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 584c3a466615..55704f758841 100644 --- a/platform/platform-resources/src/brokenPlugins.txt +++ b/platform/platform-resources/src/brokenPlugins.txt @@ -8,7 +8,7 @@ com.jetbrains.twig 133.51 130.1639 org.jetbrains.plugins.ruby 7.0.0.20140807 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 4.0.26 Karma 138.317 138.21 134.1163 134.1039 134.686 134.31 -org.intellij.scala 0.42.28 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.intellij.scala 1.0.16 1.0.14 1.0.13 0.42.28 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 diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml index 0e2e60d64fd7..9dd7590ac09e 100644 --- a/platform/platform-resources/src/componentSets/Platform.xml +++ b/platform/platform-resources/src/componentSets/Platform.xml @@ -70,11 +70,6 @@ </component> <component> - <interface-class>com.intellij.openapi.application.PathMacros</interface-class> - <implementation-class>com.intellij.application.options.PathMacrosImpl</implementation-class> - </component> - - <component> <interface-class>com.intellij.ide.ui.LafManager</interface-class> <implementation-class>com.intellij.ide.ui.laf.LafManagerImpl</implementation-class> <headless-implementation-class>com.intellij.ide.ui.laf.HeadlessLafManagerImpl</headless-implementation-class> diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 39957743629d..a9c204b1e6e7 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -709,7 +709,6 @@ <group id="XDebugger.ValueGroup" popup="false"> <reference ref="XDebugger.Inspect"/> - <reference ref="Debugger.ShowReferring"/> <reference ref="Debugger.MarkObject"/> <reference ref="XDebugger.SetValue"/> <reference ref="XDebugger.CopyValue"/> @@ -719,6 +718,7 @@ <reference ref="EvaluateExpression"/> <reference ref="Debugger.Tree.EvaluateInConsole"/> <reference ref="Debugger.Tree.AddToWatches"/> + <reference ref="Debugger.ShowReferring"/> <separator/> <reference ref="XDebugger.JumpToSource"/> <reference ref="XDebugger.JumpToTypeSource"/> @@ -817,7 +817,8 @@ <action id="SendEOF" class="com.intellij.execution.actions.EOFAction" text="Send EOF"/> <group> - <action class="com.intellij.execution.testframework.actions.ViewAssertEqualsDiffAction" text="View assertEquals Difference" id="openAssertEqualsDiff"/> + <action class="com.intellij.execution.testframework.actions.ViewAssertEqualsDiffAction" + text="View assertEquals Difference" id="openAssertEqualsDiff" use-shortcut-of="CompareDirs"/> <separator/> <add-to-group anchor="first" group-id="TestTreePopupMenu"/> </group> diff --git a/platform/platform-resources/src/launcher.py b/platform/platform-resources/src/launcher.py index 0a679eec98fe..440f716f8ebf 100644 --- a/platform/platform-resources/src/launcher.py +++ b/platform/platform-resources/src/launcher.py @@ -18,27 +18,19 @@ for i, arg in enumerate(sys.argv[1:]): print(('Usage:\n' + \ ' {0} -h |-? | --help\n' + \ ' {0} [-l|--line line] file[:line]\n' + \ - ' {0} diff file1 file2').format(sys.argv[0])) + ' {0} diff <left> <right>' + \ + ' {0} merge <local> <remote> [base] <merged>').format(sys.argv[0])) exit(0) - elif arg == 'diff' and i == 0: - args.append(arg) - elif arg == '-l' or arg == '--line': - args.append(arg) - skip_next = True - elif skip_next: - args.append(arg) - skip_next = False - else: - if ':' in arg: - file_path, line_number = arg.rsplit(':', 1) - if line_number.isdigit(): - args.append('-l') - args.append(line_number) - args.append(os.path.abspath(file_path)) - else: - args.append(os.path.abspath(arg)) + elif ':' in arg: + file_path, line_number = arg.rsplit(':', 1) + if line_number.isdigit(): + args.append('-l') + args.append(line_number) + args.append(file_path) else: - args.append(os.path.abspath(arg)) + args.append(arg) + else: + args.append(arg) def launch_with_port(port): found = False @@ -54,7 +46,6 @@ def launch_with_port(port): try: path_len = struct.unpack(">h", s.recv(2))[0] path = s.recv(path_len) - path = os.path.abspath(path) if os.path.abspath(path) == os.path.abspath(CONFIG_PATH): found = True break @@ -87,13 +78,5 @@ if port == -1: else: if launch_with_port(port): exit() -if sys.platform == "darwin": - # Mac OS: RUN_PATH is *.app path - if len(args): - args.insert(0, "--args") - os.execvp("open", ["-a", RUN_PATH] + args) -else: - # unix common - bin_dir, bin_file = os.path.split(RUN_PATH) - os.chdir(bin_dir) - os.execv(bin_file, [bin_file] + args) +bin_dir, bin_file = os.path.split(RUN_PATH) +os.execv(RUN_PATH, [bin_file] + args)
\ No newline at end of file |