diff --git a/build/package.json b/build/package.json index 3ef057689327c1348bb3850a0358e03ee824f981..f2273fd9ead5456c35bd9a7b3499ffc91aa1b6bc 100644 --- a/build/package.json +++ b/build/package.json @@ -52,7 +52,7 @@ "p-limit": "^3.1.0", "plist": "^3.0.1", "source-map": "0.6.1", - "typescript": "^4.3.0-dev.20210330", + "typescript": "^4.3.0-dev.20210407", "vsce": "1.48.0", "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58" }, diff --git a/build/yarn.lock b/build/yarn.lock index 0bb52debc94e798a385ccd0c9332a7a9717db830..f44e07a9bdfedf01a1621bcdd4236767630a5d8c 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -1884,10 +1884,10 @@ typescript@^4.1.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== -typescript@^4.3.0-dev.20210330: - version "4.3.0-dev.20210330" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210330.tgz#d8ac321a4083b30159b47c9aa21d9026d66bc3c5" - integrity sha512-QvcevtZWd2yflF5499EUAxao78bIHRzvzoZdPZKB0V+nh5RkTPQzrQXPxd76pv/cIaumqUhvlB+SEI8KB2COIw== +typescript@^4.3.0-dev.20210407: + version "4.3.0-dev.20210407" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210407.tgz#9a64dab0cd55c3baaee9a08d5eba5b6d2bee586c" + integrity sha512-zblU754+4x72OX0sWijDz/XmW6K4rgJ5DDYxLfrySU8QJWXR4i6VRgkBP03Jq1EjUfOR6cYsRXl5/wU0LNrhpA== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 6c9d07551dc59f4ae174794035123c4021b3fbd9..942f4deea45b6349d57497c6a166ef5f957e61fd 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -43,18 +43,18 @@ class CheckoutItem implements QuickPickItem { class CheckoutTagItem extends CheckoutItem { - get description(): string { + override get description(): string { return localize('tag at', "Tag at {0}", this.shortCommit); } } class CheckoutRemoteHeadItem extends CheckoutItem { - get description(): string { + override get description(): string { return localize('remote branch at', "Remote branch at {0}", this.shortCommit); } - async run(repository: Repository, opts?: { detached?: boolean }): Promise { + override async run(repository: Repository, opts?: { detached?: boolean }): Promise { if (!this.ref.name) { return; } diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts index 22c512dbf617d468cc3936643ec8392166eece98..55dccba4b7ae4d5399f1602e77a5e1de910d166a 100644 --- a/extensions/markdown-language-features/src/features/preview.ts +++ b/extensions/markdown-language-features/src/features/preview.ts @@ -207,7 +207,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider { this.updatePreview(); } - dispose() { + override dispose() { super.dispose(); this._disposed = true; clearTimeout(this.throttleTimer); @@ -537,7 +537,7 @@ export class StaticMarkdownPreview extends Disposable implements ManagedMarkdown private readonly _onDidChangeViewState = this._register(new vscode.EventEmitter()); public readonly onDidChangeViewState = this._onDidChangeViewState.event; - dispose() { + override dispose() { this._onDispose.fire(); super.dispose(); } @@ -682,7 +682,7 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow private readonly _onDidChangeViewStateEmitter = this._register(new vscode.EventEmitter()); public readonly onDidChangeViewState = this._onDidChangeViewStateEmitter.event; - dispose() { + override dispose() { this._preview.dispose(); this._webviewPanel.dispose(); diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts index 1b0dc660bb4b521fcfc6a6f9056853823a2107b3..05729e0873a723bda406445740b4360178f2f0d0 100644 --- a/extensions/markdown-language-features/src/features/previewManager.ts +++ b/extensions/markdown-language-features/src/features/previewManager.ts @@ -23,7 +23,7 @@ class PreviewStore extends Disposable { private readonly _previews = new Set(); - public dispose(): void { + public override dispose(): void { super.dispose(); for (const preview of this._previews) { preview.dispose(); diff --git a/extensions/php-language-features/src/features/utils/async.ts b/extensions/php-language-features/src/features/utils/async.ts index 866118beac06ddce5cd3f8ebcb3d20b94b36b3f5..7364553e081b36d7bc29cf2858207ee4a56843cd 100644 --- a/extensions/php-language-features/src/features/utils/async.ts +++ b/extensions/php-language-features/src/features/utils/async.ts @@ -179,7 +179,7 @@ export class ThrottledDelayer extends Delayer> { this.throttler = new Throttler(); } - public trigger(promiseFactory: ITask>, delay?: number): Promise> { + public override trigger(promiseFactory: ITask>, delay?: number): Promise> { return super.trigger(() => this.throttler.queue(promiseFactory), delay); } } diff --git a/extensions/simple-browser/src/simpleBrowserView.ts b/extensions/simple-browser/src/simpleBrowserView.ts index 4923b3ae132d3aeec4d58864f6dd9fd6cbcab80c..5fabf32a31246a6a94ca4bc5aba541e613d06827 100644 --- a/extensions/simple-browser/src/simpleBrowserView.ts +++ b/extensions/simple-browser/src/simpleBrowserView.ts @@ -72,7 +72,7 @@ export class SimpleBrowserView extends Disposable { this.show(url); } - public dispose() { + public override dispose() { this._onDidDispose.fire(); super.dispose(); } diff --git a/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts b/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts index bbb8e21ec2f7cc3704fc16e544cdc2ef099dd872..d90972555a977ee2c6fe55339aca75609200a3cb 100644 --- a/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts +++ b/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts @@ -19,7 +19,7 @@ const localize = nls.loadMessageBundle(); export class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLensProvider { public constructor( - protected client: ITypeScriptServiceClient, + client: ITypeScriptServiceClient, protected _cachedResponse: CachedResponse, private modeId: string ) { diff --git a/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts b/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts index 25a9591cc5687437ab90fbeb277df7a833b929ff..0fd8dec58321fd981b1ae5f8ad48f934e983f91e 100644 --- a/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts +++ b/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts @@ -160,7 +160,7 @@ export class DiagnosticsManager extends Disposable { this._currentDiagnostics = this._register(vscode.languages.createDiagnosticCollection(owner)); } - public dispose() { + public override dispose() { super.dispose(); for (const value of this._pendingUpdates.values) { diff --git a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts index 289ce73b29370e0cdebbacab36d4c3f263fc549d..c1d53a030ed284647205785ecdb6cee5650c1b7c 100644 --- a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts +++ b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts @@ -29,7 +29,7 @@ class TagClosing extends Disposable { this._disposables); } - public dispose() { + public override dispose() { super.dispose(); this._disposed = true; diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts index 4ca6fbe4fa5d0806f8ce67d8e82352ea02552b52..5ede4ef49fc6c889412b342d6df905aaa44c2838 100644 --- a/extensions/typescript-language-features/src/tsServer/server.ts +++ b/extensions/typescript-language-features/src/tsServer/server.ts @@ -117,7 +117,7 @@ export class ProcessBasedTsServer extends Disposable implements ITypeScriptServe this._process.write(serverRequest); } - public dispose() { + public override dispose() { super.dispose(); this._callbacks.destroy('server disposed'); this._pendingResponses.clear(); diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index 62533a9d2499093b60ce9cd887c81435ca9ed63c..a56c6d77f754d78dfed918f9ab20543a4f1c9e8f 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -261,7 +261,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType return this._configuration; } - public dispose() { + public override dispose() { super.dispose(); this.bufferSyncSupport.dispose(); diff --git a/extensions/typescript-language-features/src/utils/typingsStatus.ts b/extensions/typescript-language-features/src/utils/typingsStatus.ts index efb9a540e0455f0b20439c858646ac89457d92f8..c9b9a909a8efaa2cd697cb3e6deb605341c8b465 100644 --- a/extensions/typescript-language-features/src/utils/typingsStatus.ts +++ b/extensions/typescript-language-features/src/utils/typingsStatus.ts @@ -27,7 +27,7 @@ export default class TypingsStatus extends Disposable { this._client.onDidEndInstallTypings(event => this.onEndInstallTypings(event.eventId))); } - public dispose(): void { + public override dispose(): void { super.dispose(); for (const timeout of this._acquiringTypings.values()) { @@ -68,7 +68,7 @@ export class AtaProgressReporter extends Disposable { this._register(client.onTypesInstallerInitializationFailed(_ => this.onTypesInstallerInitializationFailed())); } - dispose(): void { + override dispose(): void { super.dispose(); this._promises.forEach(value => value()); } diff --git a/extensions/vscode-custom-editor-tests/src/customTextEditor.ts b/extensions/vscode-custom-editor-tests/src/customTextEditor.ts index cced14b9401e15776869b5344fa03ea9efd18af0..c2b3754b82b8e769e8c373a4ccd1f557aeead467 100644 --- a/extensions/vscode-custom-editor-tests/src/customTextEditor.ts +++ b/extensions/vscode-custom-editor-tests/src/customTextEditor.ts @@ -121,7 +121,7 @@ class AbcEditor extends Disposable { }); } - public dispose() { + public override dispose() { if (this.isDisposed) { return; } diff --git a/package.json b/package.json index 4ecaecab5729b4e708a2f1fd3c9a4aafffb69b98..39434c60a1bdf6fefd7835be05e50c1d630d2e88 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,7 @@ "style-loader": "^1.0.0", "ts-loader": "^6.2.1", "tsec": "0.1.4", - "typescript": "^4.3.0-dev.20210330", + "typescript": "^4.3.0-dev.20210407", "typescript-formatter": "7.1.0", "underscore": "^1.8.2", "vinyl": "^2.0.0", diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts index 983d30c3df7007afa9c579d0d41d6e160c0d09b5..71966e69b8d67fcaf83c1790ee13850a7fe94772 100644 --- a/src/vs/base/common/types.ts +++ b/src/vs/base/common/types.ts @@ -240,19 +240,19 @@ export function withUndefinedAsNull(x: T | undefined): T | null { return typeof x === 'undefined' ? null : x; } +type AddFirstParameterToFunction = T extends (...args: any[]) => TargetFunctionsReturnType ? + // Function: add param to function + (firstArg: FirstParameter, ...args: Parameters) => ReturnType : + + // Else: just leave as is + T; + /** * Allows to add a first parameter to functions of a type. */ export type AddFirstParameterToFunctions = { - - // For every property - [K in keyof Target]: - - // Function: add param to function - Target[K] extends (...args: any[]) => TargetFunctionsReturnType ? (firstArg: FirstParameter, ...args: Parameters) => ReturnType : - - // Else: just leave as is - Target[K] + // For every property + [K in keyof Target]: AddFirstParameterToFunction; }; /** diff --git a/yarn.lock b/yarn.lock index 8346e25c317c2d5bf9f661ba39165e9c337a8f55..9807a7e679c04189ec323181f70dc5c58a768350 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9648,10 +9648,10 @@ typescript@^2.6.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q= -typescript@^4.3.0-dev.20210330: - version "4.3.0-dev.20210330" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210330.tgz#d8ac321a4083b30159b47c9aa21d9026d66bc3c5" - integrity sha512-QvcevtZWd2yflF5499EUAxao78bIHRzvzoZdPZKB0V+nh5RkTPQzrQXPxd76pv/cIaumqUhvlB+SEI8KB2COIw== +typescript@^4.3.0-dev.20210407: + version "4.3.0-dev.20210407" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210407.tgz#9a64dab0cd55c3baaee9a08d5eba5b6d2bee586c" + integrity sha512-zblU754+4x72OX0sWijDz/XmW6K4rgJ5DDYxLfrySU8QJWXR4i6VRgkBP03Jq1EjUfOR6cYsRXl5/wU0LNrhpA== typical@^4.0.0: version "4.0.0"