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

update dependencies, fix promise typing issue

Browse source
This commit is contained in:
Martin Aeschlimann 2018-02-07 09:59:03 +01:00
parent c4f9df0f80
commit ff043657bd
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
package.json
View file

@ -25,12 +25,12 @@
"gulp-tsb": "^2.0.0", "gulp-tsb": "^2.0.0",
"gulp-uglify": "^1.5.3", "gulp-uglify": "^1.5.3",
"merge-stream": "^1.0.0", "merge-stream": "^1.0.0",
"monaco-editor-core": "^0.10.0", "monaco-editor-core": "^0.10.1",
"monaco-languages": "^0.9.0", "monaco-languages": "^0.9.0",
"object-assign": "^4.1.0", "object-assign": "^4.1.0",
"rimraf": "^2.5.2", "rimraf": "^2.5.2",
"typescript": "2.3.4", "typescript": "^2.7.1",
"vscode-json-languageservice": "^2.0.11", "vscode-languageserver-types": "^3.5.0",
"vscode-languageserver-types": "^3.3.0-alpha.1" "vscode-json-languageservice": "^3.0.5"
} }
} }

11
src/jsonWorker.ts
View file

@ -11,7 +11,6 @@ import IWorkerContext = monaco.worker.IWorkerContext;
import * as jsonService from 'vscode-json-languageservice'; import * as jsonService from 'vscode-json-languageservice';
import * as ls from 'vscode-languageserver-types'; import * as ls from 'vscode-languageserver-types';
class PromiseAdapter<T> implements jsonService.Thenable<T> { class PromiseAdapter<T> implements jsonService.Thenable<T> {
private wrapped: monaco.Promise<T>; private wrapped: monaco.Promise<T>;
@ -19,17 +18,17 @@ class PromiseAdapter<T> implements jsonService.Thenable<T> {
this.wrapped = new monaco.Promise<T>(executor); this.wrapped = new monaco.Promise<T>(executor);
} }
public then<TResult>(onfulfilled?: (value: T) => TResult | jsonService.Thenable<TResult>, onrejected?: (reason: any) => void): jsonService.Thenable<TResult> { public then<TResult>(onfulfilled?: (value: T) => TResult | jsonService.Thenable<TResult>, onrejected?: (reason: any) => void): jsonService.Thenable<TResult> {
return this.wrapped.then(onfulfilled, onrejected); let thenable : monaco.Thenable<T> = this.wrapped;
return thenable.then(onfulfilled, onrejected);
} }
public getWrapped(): monaco.Promise<T> { public getWrapped(): monaco.Thenable<T> {
return this.wrapped; return this.wrapped;
} }
public cancel(): void { public cancel(): void {
this.wrapped.cancel(); this.wrapped.cancel();
} }
public static resolve<T>(v: T | Thenable<T>): jsonService.Thenable<T> {
public static resolve<T>(v: T): jsonService.Thenable<T> { return <monaco.Thenable<T>> monaco.Promise.as(v);
return monaco.Promise.as(v);
} }
public static reject<T>(v: T): jsonService.Thenable<T> { public static reject<T>(v: T): jsonService.Thenable<T> {
return monaco.Promise.wrapError(v); return monaco.Promise.wrapError(v);