grid - move opener service into editor

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';

src/vs/platform/opener/test/browser/openerService.test.ts → 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 () {
 

src/vs/platform/opener/browser/opener.contribution.ts

-/*---------------------------------------------------------------------------------------------
- *  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);

src/vs/platform/opener/common/opener.ts

@@ -10,7 +10,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 
 export const IOpenerService = createDecorator<IOpenerService>('openerService');
 
-
 export interface IOpenerService {
 
 	_serviceBrand: any;

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';

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));