Adopt native promises

src/cssMode.ts

@@ -9,7 +9,6 @@ import { CSSWorker } from './cssWorker';
 import { LanguageServiceDefaultsImpl } from './monaco.contribution';
 import * as languageFeatures from './languageFeatures';
 
-import Promise = monaco.Promise;
 import Uri = monaco.Uri;
 
 export function setupMode(defaults: LanguageServiceDefaultsImpl): void {
@@ -33,7 +32,3 @@ export function setupMode(defaults: LanguageServiceDefaultsImpl): void {
 	monaco.languages.registerFoldingRangeProvider(languageId, new languageFeatures.FoldingRangeAdapter(worker));
 	new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults);
 }
-
-
-
-

src/cssWorker.ts

@@ -5,7 +5,6 @@
 'use strict';
 
 import Thenable = monaco.Thenable;
-import Promise = monaco.Promise;
 import IWorkerContext = monaco.worker.IWorkerContext;
 
 import * as cssService from 'vscode-css-languageservice';
@@ -47,74 +46,74 @@ export class CSSWorker {
 		if (document) {
 			let stylesheet = this._languageService.parseStylesheet(document);
 			let diagnostics = this._languageService.doValidation(document, stylesheet);
-			return Promise.as(diagnostics)
+			return Promise.resolve(diagnostics)
 		}
-		return Promise.as([]);
+		return Promise.resolve([]);
 	}
 	doComplete(uri: string, position: ls.Position): Thenable<ls.CompletionList> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let completions = this._languageService.doComplete(document, position, stylesheet);
-		return Promise.as(completions);
+		return Promise.resolve(completions);
 	}
 	doHover(uri: string, position: ls.Position): Thenable<ls.Hover> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let hover = this._languageService.doHover(document, position, stylesheet);
-		return Promise.as(hover);
+		return Promise.resolve(hover);
 	}
 	findDefinition(uri: string, position: ls.Position): Thenable<ls.Location> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let definition = this._languageService.findDefinition(document, position, stylesheet);
-		return Promise.as(definition);
+		return Promise.resolve(definition);
 	}
 	findReferences(uri: string, position: ls.Position): Thenable<ls.Location[]> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let references = this._languageService.findReferences(document, position, stylesheet);
-		return Promise.as(references);
+		return Promise.resolve(references);
 	}
 	findDocumentHighlights(uri: string, position: ls.Position): Thenable<ls.DocumentHighlight[]> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let highlights = this._languageService.findDocumentHighlights(document, position, stylesheet);
-		return Promise.as(highlights);
+		return Promise.resolve(highlights);
 	}
 	findDocumentSymbols(uri: string): Thenable<ls.SymbolInformation[]> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let symbols = this._languageService.findDocumentSymbols(document, stylesheet);
-		return Promise.as(symbols);
+		return Promise.resolve(symbols);
 	}
 	doCodeActions(uri: string, range: ls.Range, context: ls.CodeActionContext): Thenable<ls.Command[]> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let actions = this._languageService.doCodeActions(document, range, context, stylesheet);
-		return Promise.as(actions);
+		return Promise.resolve(actions);
 	}
 	findDocumentColors(uri: string): Thenable<ls.ColorInformation[]> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let colorSymbols = this._languageService.findDocumentColors(document, stylesheet);
-		return Promise.as(colorSymbols);
+		return Promise.resolve(colorSymbols);
 	}
 	getColorPresentations(uri: string, color: ls.Color, range: ls.Range): Thenable<ls.ColorPresentation[]> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let colorPresentations = this._languageService.getColorPresentations(document, stylesheet, color, range);
-		return Promise.as(colorPresentations);
+		return Promise.resolve(colorPresentations);
 	}
 	provideFoldingRanges(uri: string, context?: { rangeLimit?: number; }): Thenable<ls.FoldingRange[]> {
 		let document = this._getTextDocument(uri);
 		let ranges = this._languageService.getFoldingRanges(document, context);
-		return Promise.as(ranges);
+		return Promise.resolve(ranges);
 	}
 	doRename(uri: string, position: ls.Position, newName: string): Thenable<ls.WorkspaceEdit> {
 		let document = this._getTextDocument(uri);
 		let stylesheet = this._languageService.parseStylesheet(document);
 		let renames = this._languageService.doRename(document, position, newName, stylesheet);
-		return Promise.as(renames);
+		return Promise.resolve(renames);
 	}
 	private _getTextDocument(uri: string): ls.TextDocument {
 		let models = this._ctx.getMirrorModels();

src/languageFeatures.ts

@@ -14,7 +14,6 @@ import Position = monaco.Position;
 import IRange = monaco.IRange;
 import Range = monaco.Range;
 import Thenable = monaco.Thenable;
-import Promise = monaco.Promise;
 import CancellationToken = monaco.CancellationToken;
 import IDisposable = monaco.IDisposable;
 

src/monaco.contribution.ts

@@ -82,8 +82,8 @@ monaco.languages.css = createAPI();
 
 // --- Registration to monaco editor ---
 
-function getMode(): monaco.Promise<typeof mode> {
+function getMode(): Promise<typeof mode> {
-	return monaco.Promise.wrap(import('./cssMode'))
+	return import('./cssMode');
 }
 
 monaco.languages.onLanguage('less', () => {

src/workerManager.ts

@@ -7,7 +7,6 @@
 import { LanguageServiceDefaultsImpl } from './monaco.contribution';
 import { CSSWorker } from './cssWorker';
 
-import Promise = monaco.Promise;
 import IDisposable = monaco.IDisposable;
 import Uri = monaco.Uri;
 
@@ -73,7 +72,7 @@ export class WorkerManager {
 				}
 			});
 
-			this._client = this._worker.getProxy();
+			this._client = <Promise<CSSWorker>><any>this._worker.getProxy();
 		}
 
 		return this._client;