Merge from master

src/vs/editor/test/browser/services/decorationRenderOptions.test.ts

@@ -2,18 +2,21 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
 import * as dom from 'vs/base/browser/dom';
+import { URI } from 'vs/base/common/uri';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl';
 import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
+import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { TestTheme, TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 
 const themeServiceMock = new TestThemeService();
 
+// {{SQL CARBON EDIT}} - Remove exported test class
 suite('Decoration Render Options', () => {
 	test('register and resolve decoration type', () => {
+		// {{SQL CARBON EDIT}} - Remove test
 	});
 });

src/vs/editor/test/browser/services/openerService.test.ts

@@ -2,14 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import URI from 'vs/base/common/uri';
 import * as assert from 'assert';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
-import { ICommandService, NullCommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { URI } from 'vs/base/common/uri';
 import { OpenerService } from 'vs/editor/browser/services/openerService';
+import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
+import { CommandsRegistry, ICommandService, NullCommandService } from 'vs/platform/commands/common/commands';
 
 suite('OpenerService', function () {
 
@@ -20,9 +17,9 @@ suite('OpenerService', function () {
 	const commandService = new class implements ICommandService {
 		_serviceBrand: any;
 		onWillExecuteCommand = () => ({ dispose: () => { } });
-		executeCommand(id: string, ...args: any[]): TPromise<any> {
+		executeCommand(id: string, ...args: any[]): Promise<any> {
 			lastCommand = { id, args };
-			return TPromise.as(undefined);
+			return Promise.resolve(undefined);
 		}
 	};
 
@@ -106,4 +103,4 @@ suite('OpenerService', function () {
 		assert.equal(lastCommand.args[0], 12);
 		assert.equal(lastCommand.args[1], true);
 	});
-});
+});