Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

This commit is contained in:
Anthony Dresser
2019-03-22 13:07:54 -07:00
committed by GitHub
parent f5c9174c2f
commit 4a87a24235
296 changed files with 2531 additions and 2472 deletions

View File

@@ -23,7 +23,7 @@ import { exit, ExtensionHostMain } from 'vs/workbench/services/extensions/node/e
const Module = require.__$__nodeRequire('module') as any;
const originalLoad = Module._load;
Module._load = function (request) {
Module._load = function (request: string) {
if (request === 'natives') {
throw new Error('Either the extension or a NPM dependency is using the "natives" node module which is unsupported as it can cause a crash of the extension host. Click [here](https://go.microsoft.com/fwlink/?linkid=871887) to find out more');
}

View File

@@ -83,7 +83,7 @@ export class LazyPromise implements Promise<any> {
return this._ensureActual().then(undefined, error);
}
public finally(callback): any {
public finally(callback: () => void): any {
return this._ensureActual().finally(callback);
}
}