SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 17:25:39 +01:00
Code Issues Projects Releases Packages Activity

Adopt native promises

Browse source
This commit is contained in:
Alex Dima 2019-01-09 16:27:23 +01:00
parent f3174dba95
commit a103c438d4
5 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/htmlMode.ts
View file

@ -9,7 +9,6 @@ import { HTMLWorker } from './htmlWorker';
import { LanguageServiceDefaultsImpl } from './monaco.contribution';
import * as languageFeatures from './languageFeatures';
import Promise = monaco.Promise;
import Uri = monaco.Uri;
export function setupMode(defaults: LanguageServiceDefaultsImpl): void {

13
src/htmlWorker.ts
View file

@ -7,7 +7,6 @@
import IWorkerContext = monaco.worker.IWorkerContext;
import Thenable = monaco.Thenable;
import Promise = monaco.Promise;
import * as htmlService from 'vscode-html-languageservice';
import * as ls from 'vscode-languageserver-types';
@ -29,33 +28,33 @@ export class HTMLWorker {
doValidation(uri: string): Thenable<ls.Diagnostic[]> {
// not yet suported
return Promise.as([]);
return Promise.resolve([]);
}
doComplete(uri: string, position: ls.Position): Thenable<ls.CompletionList> {
let document = this._getTextDocument(uri);
let htmlDocument = this._languageService.parseHTMLDocument(document);
return Promise.as(this._languageService.doComplete(document, position, htmlDocument, this._languageSettings && this._languageSettings.suggest));
return Promise.resolve(this._languageService.doComplete(document, position, htmlDocument, this._languageSettings && this._languageSettings.suggest));
}
format(uri: string, range: ls.Range, options: ls.FormattingOptions): Thenable<ls.TextEdit[]> {
let document = this._getTextDocument(uri);
let textEdits = this._languageService.format(document, range, this._languageSettings && this._languageSettings.format);
return Promise.as(textEdits);
return Promise.resolve(textEdits);
}
findDocumentHighlights(uri: string, position: ls.Position): Thenable<ls.DocumentHighlight[]> {
let document = this._getTextDocument(uri);
let htmlDocument = this._languageService.parseHTMLDocument(document);
let highlights = this._languageService.findDocumentHighlights(document, position, htmlDocument);
return Promise.as(highlights);
return Promise.resolve(highlights);
}
findDocumentLinks(uri: string): Thenable<ls.DocumentLink[]> {
let document = this._getTextDocument(uri);
let links = this._languageService.findDocumentLinks(document, null);
return Promise.as(links);
return Promise.resolve(links);
}
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);
}
private _getTextDocument(uri: string): ls.TextDocument {
let models = this._ctx.getMirrorModels();

1
src/languageFeatures.ts
View file

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

4
src/monaco.contribution.ts
View file

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

3
src/workerManager.ts
View file

@ -7,7 +7,6 @@
import { LanguageServiceDefaultsImpl } from './monaco.contribution';
import { HTMLWorker } from './htmlWorker';
import Promise = monaco.Promise;
import IDisposable = monaco.IDisposable;
import Uri = monaco.Uri;
@ -73,7 +72,7 @@ export class WorkerManager {
label: this._defaults.languageId
});
this._client = this._worker.getProxy();
this._client = <Promise<HTMLWorker>>this._worker.getProxy();
}
return this._client;