diff --git a/package.json b/package.json index d55272e9772..8b660bca986 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@types/iconv-lite": "0.0.1", "@types/keytar": "^4.4.0", "@types/mocha": "2.2.39", - "@types/node": "^10.12.12", + "@types/node": "^12.11.7", "@types/sinon": "^1.16.36", "@types/webpack": "^4.4.10", "@types/windows-foreground-love": "^0.3.0", diff --git a/src/tsconfig.json b/src/tsconfig.json index 8917d57336d..7e1e6c6d108 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -24,6 +24,7 @@ "./vs" ], "exclude": [ + "./typings/es6-promise.d.ts", "./typings/require-monaco.d.ts", "./typings/xterm.d.ts", "./typings/xterm-addon-search.d.ts", diff --git a/src/typings/lib.ie11_safe_es6.d.ts b/src/typings/lib.ie11_safe_es6.d.ts index 43bde6f7c64..547ba246917 100644 --- a/src/typings/lib.ie11_safe_es6.d.ts +++ b/src/typings/lib.ie11_safe_es6.d.ts @@ -25,7 +25,7 @@ interface Map { interface MapConstructor { new (): Map; - prototype: Map; + readonly prototype: Map; // not supported on IE11: // new (iterable: Iterable<[K, V]>): Map; @@ -51,7 +51,7 @@ interface Set { interface SetConstructor { new (): Set; - prototype: Set; + readonly prototype: Set; // not supported on IE11: // new (iterable: Iterable): Set; diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index cb0a39611e7..a2b6766b209 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -34,7 +34,7 @@ export function createCancelablePromise(callback: (token: CancellationToken) }); }); - return new class implements CancelablePromise { + return >new class { cancel() { source.cancel(); } diff --git a/src/vs/base/node/decoder.ts b/src/vs/base/node/decoder.ts index 0e313a5715a..767cf6d89c1 100644 --- a/src/vs/base/node/decoder.ts +++ b/src/vs/base/node/decoder.ts @@ -15,7 +15,7 @@ import { CharCode } from 'vs/base/common/charCode'; * - forEach() over the result to get the lines */ export class LineDecoder { - private stringDecoder: sd.NodeStringDecoder; + private stringDecoder: sd.StringDecoder; private remaining: string | null; constructor(encoding: string = 'utf8') { diff --git a/src/vs/workbench/services/extensions/common/lazyPromise.ts b/src/vs/workbench/services/extensions/common/lazyPromise.ts index 6cd7ce76aa6..0f6c07064a3 100644 --- a/src/vs/workbench/services/extensions/common/lazyPromise.ts +++ b/src/vs/workbench/services/extensions/common/lazyPromise.ts @@ -27,6 +27,10 @@ export class LazyPromise implements Promise { this._err = null; } + get [Symbol.toStringTag](): string { + return this.toString(); + } + private _ensureActual(): Promise { if (!this._actual) { this._actual = new Promise((c, e) => { diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts index fc838b95e80..8a4da30f57d 100644 --- a/src/vs/workbench/services/search/node/fileSearch.ts +++ b/src/vs/workbench/services/search/node/fileSearch.ts @@ -7,7 +7,7 @@ import * as childProcess from 'child_process'; import * as fs from 'fs'; import * as path from 'vs/base/common/path'; import { Readable } from 'stream'; -import { NodeStringDecoder, StringDecoder } from 'string_decoder'; +import { StringDecoder } from 'string_decoder'; import * as arrays from 'vs/base/common/arrays'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import * as glob from 'vs/base/common/glob'; @@ -360,7 +360,7 @@ export class FileWalker { }); } - private forwardData(stream: Readable, encoding: string, cb: (err: Error | null, stdout?: string) => void): NodeStringDecoder { + private forwardData(stream: Readable, encoding: string, cb: (err: Error | null, stdout?: string) => void): StringDecoder { const decoder = new StringDecoder(encoding); stream.on('data', (data: Buffer) => { cb(null, decoder.write(data)); diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts index ac159a60c92..336d4cd0350 100644 --- a/src/vs/workbench/services/search/node/rawSearchService.ts +++ b/src/vs/workbench/services/search/node/rawSearchService.ts @@ -380,6 +380,7 @@ export class SearchService implements IRawSearchService { */ private preventCancellation(promise: CancelablePromise): CancelablePromise { return new class implements CancelablePromise { + get [Symbol.toStringTag]() { return this.toString(); } cancel() { // Do nothing } diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts index 835b0dc041b..99dd5602e4d 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts @@ -6,7 +6,7 @@ import * as cp from 'child_process'; import { EventEmitter } from 'events'; import * as path from 'vs/base/common/path'; -import { NodeStringDecoder, StringDecoder } from 'string_decoder'; +import { StringDecoder } from 'string_decoder'; import { createRegExp, startsWith, startsWithUTF8BOM, stripUTF8BOM, escapeRegExpCharacters, endsWith } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; import { IExtendedExtensionSearchOptions, SearchError, SearchErrorCode, serializeSearchError } from 'vs/workbench/services/search/common/search'; @@ -169,7 +169,7 @@ export class RipgrepParser extends EventEmitter { private remainder = ''; private isDone = false; private hitLimit = false; - private stringDecoder: NodeStringDecoder; + private stringDecoder: StringDecoder; private numResults = 0; diff --git a/yarn.lock b/yarn.lock index 8c2e276bbec..687f0af9b44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -167,10 +167,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e" integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ== -"@types/node@^10.12.12": - version "10.12.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.12.tgz#e15a9d034d9210f00320ef718a50c4a799417c47" - integrity sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A== +"@types/node@^12.11.7": + version "12.12.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2" + integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA== "@types/node@^10.12.18": version "10.17.9"