From b892ded0d35451135c8f13cb11703ed613028579 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 16 May 2018 10:01:05 +0200 Subject: [PATCH] grid - move opener service into editor --- .../browser/services}/openerService.ts | 0 src/vs/editor/standalone/browser/standaloneEditor.ts | 2 +- .../test/browser/services}/openerService.test.ts | 2 +- .../platform/opener/browser/opener.contribution.ts | 12 ------------ src/vs/platform/opener/common/opener.ts | 1 - src/vs/workbench/electron-browser/shell.ts | 1 - src/vs/workbench/electron-browser/workbench.ts | 5 +++++ 7 files changed, 7 insertions(+), 16 deletions(-) rename src/vs/{platform/opener/browser => editor/browser/services}/openerService.ts (100%) rename src/vs/{platform/opener/test/browser => editor/test/browser/services}/openerService.test.ts (98%) delete mode 100644 src/vs/platform/opener/browser/opener.contribution.ts diff --git a/src/vs/platform/opener/browser/openerService.ts b/src/vs/editor/browser/services/openerService.ts similarity index 100% rename from src/vs/platform/opener/browser/openerService.ts rename to src/vs/editor/browser/services/openerService.ts diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts index 1612563d285..a184bbed034 100644 --- a/src/vs/editor/standalone/browser/standaloneEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneEditor.ts @@ -13,7 +13,7 @@ import { IEditorOverrideServices, DynamicStandaloneServices, StaticServices } fr import { IDisposable } from 'vs/base/common/lifecycle'; import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; -import { OpenerService } from 'vs/platform/opener/browser/openerService'; +import { OpenerService } from 'vs/editor/browser/services/openerService'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { Colorizer, IColorizerElementOptions, IColorizerOptions } from 'vs/editor/standalone/browser/colorizer'; import { SimpleEditorService, SimpleEditorModelResolverService } from 'vs/editor/standalone/browser/simpleServices'; diff --git a/src/vs/platform/opener/test/browser/openerService.test.ts b/src/vs/editor/test/browser/services/openerService.test.ts similarity index 98% rename from src/vs/platform/opener/test/browser/openerService.test.ts rename to src/vs/editor/test/browser/services/openerService.test.ts index 813280aae71..6c6a4481d1d 100644 --- a/src/vs/platform/opener/test/browser/openerService.test.ts +++ b/src/vs/editor/test/browser/services/openerService.test.ts @@ -9,7 +9,7 @@ import * as assert from 'assert'; import { TPromise } from 'vs/base/common/winjs.base'; import { IEditorService, IResourceInput } from 'vs/platform/editor/common/editor'; import { ICommandService, NullCommandService, CommandsRegistry } from 'vs/platform/commands/common/commands'; -import { OpenerService } from 'vs/platform/opener/browser/openerService'; +import { OpenerService } from 'vs/editor/browser/services/openerService'; suite('OpenerService', function () { diff --git a/src/vs/platform/opener/browser/opener.contribution.ts b/src/vs/platform/opener/browser/opener.contribution.ts deleted file mode 100644 index 895569280a5..00000000000 --- a/src/vs/platform/opener/browser/opener.contribution.ts +++ /dev/null @@ -1,12 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -'use strict'; - -import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; -import { OpenerService } from 'vs/platform/opener/browser/openerService'; -import { IOpenerService } from 'vs/platform/opener/common/opener'; - -registerSingleton(IOpenerService, OpenerService); diff --git a/src/vs/platform/opener/common/opener.ts b/src/vs/platform/opener/common/opener.ts index 172602ec49e..44e16595037 100644 --- a/src/vs/platform/opener/common/opener.ts +++ b/src/vs/platform/opener/common/opener.ts @@ -10,7 +10,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const IOpenerService = createDecorator('openerService'); - export interface IOpenerService { _serviceBrand: any; diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 4f0ebabd7a6..fbe9e35b899 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -69,7 +69,6 @@ import { ITimerService } from 'vs/workbench/services/timer/common/timerService'; import { BareFontInfo } from 'vs/editor/common/config/fontInfo'; import { restoreFontInfo, readFontInfo, saveFontInfo } from 'vs/editor/browser/config/configuration'; import * as browser from 'vs/base/browser/browser'; -import 'vs/platform/opener/browser/opener.contribution'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { WorkbenchThemeService } from 'vs/workbench/services/themes/electron-browser/workbenchThemeService'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 1d8e9a023fb..bf0224df979 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -113,6 +113,8 @@ import { NextEditorPart } from 'vs/workbench/browser/parts/editor2/nextEditorPar import { INextEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/nextEditorGroupsService'; import { NextEditorService } from 'vs/workbench/services/editor/browser/nextEditorService'; import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler'; +import { IOpenerService } from 'vs/platform/opener/common/opener'; +import { OpenerService } from 'vs/editor/browser/services/openerService'; interface WorkbenchParams { configuration: IWindowConfiguration; @@ -387,6 +389,9 @@ export class Workbench extends Disposable implements IPartService { this.editorService = this.instantiationService.createInstance(NextEditorService); serviceCollection.set(INextEditorService, this.editorService); + // Opener service + serviceCollection.set(IOpenerService, new SyncDescriptor(OpenerService)); + // TODO@grid Remove Legacy Editor Services const noOpEditorPart = new NoOpEditorPart(this.instantiationService); serviceCollection.set(IWorkbenchEditorService, this.instantiationService.createInstance(WorkbenchEditorService, noOpEditorPart)); -- GitLab