Skip to content

Commit

Permalink
Pick up new TS 4.3
Browse files Browse the repository at this point in the history
Also tests adding override keywords for extensions as part of microsoft#120675
  • Loading branch information
mjbvz committed Apr 7, 2021
1 parent 05b52df commit 91c36ee
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.20210406",
"vsce": "1.48.0",
"vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58"
},
Expand Down
8 changes: 4 additions & 4 deletions build/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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.20210406:
version "4.3.0-dev.20210406"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210406.tgz#6994270b6bfd539c1946e2b548f5a9706f448fce"
integrity sha512-GQ6DfMTuUsy9oWOjrzBNL/aLgVy6ef/vS1j0iILTaaAc0tojeMIs5LNQMVc0aclcuuKnzuv9jXrBcpc045JWgQ==

uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.5"
Expand Down
6 changes: 3 additions & 3 deletions extensions/git/src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> {
override async run(repository: Repository, opts?: { detached?: boolean }): Promise<void> {
if (!this.ref.name) {
return;
}
Expand Down
6 changes: 3 additions & 3 deletions extensions/markdown-language-features/src/features/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
this.updatePreview();
}

dispose() {
override dispose() {
super.dispose();
this._disposed = true;
clearTimeout(this.throttleTimer);
Expand Down Expand Up @@ -537,7 +537,7 @@ export class StaticMarkdownPreview extends Disposable implements ManagedMarkdown
private readonly _onDidChangeViewState = this._register(new vscode.EventEmitter<vscode.WebviewPanelOnDidChangeViewStateEvent>());
public readonly onDidChangeViewState = this._onDidChangeViewState.event;

dispose() {
override dispose() {
this._onDispose.fire();
super.dispose();
}
Expand Down Expand Up @@ -682,7 +682,7 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
private readonly _onDidChangeViewStateEmitter = this._register(new vscode.EventEmitter<vscode.WebviewPanelOnDidChangeViewStateEvent>());
public readonly onDidChangeViewState = this._onDidChangeViewStateEmitter.event;

dispose() {
override dispose() {
this._preview.dispose();
this._webviewPanel.dispose();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class PreviewStore<T extends ManagedMarkdownPreview> extends Disposable {

private readonly _previews = new Set<T>();

public dispose(): void {
public override dispose(): void {
super.dispose();
for (const preview of this._previews) {
preview.dispose();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export class ThrottledDelayer<T> extends Delayer<Promise<T>> {
this.throttler = new Throttler<T>();
}

public trigger(promiseFactory: ITask<Promise<T>>, delay?: number): Promise<Promise<T>> {
public override trigger(promiseFactory: ITask<Promise<T>>, delay?: number): Promise<Promise<T>> {
return super.trigger(() => this.throttler.queue(promiseFactory), delay);
}
}
2 changes: 1 addition & 1 deletion extensions/simple-browser/src/simpleBrowserView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class SimpleBrowserView extends Disposable {
this.show(url);
}

public dispose() {
public override dispose() {
this._onDidDispose.fire();
super.dispose();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const localize = nls.loadMessageBundle();

export class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLensProvider {
public constructor(
protected client: ITypeScriptServiceClient,
client: ITypeScriptServiceClient,
protected _cachedResponse: CachedResponse<Proto.NavTreeResponse>,
private modeId: string
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TagClosing extends Disposable {
this._disposables);
}

public dispose() {
public override dispose() {
super.dispose();
this._disposed = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down Expand Up @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class AbcEditor extends Disposable {
});
}

public dispose() {
public override dispose() {
if (this.isDisposed) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.20210406",
"typescript-formatter": "7.1.0",
"underscore": "^1.8.2",
"vinyl": "^2.0.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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.20210406:
version "4.3.0-dev.20210406"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210406.tgz#6994270b6bfd539c1946e2b548f5a9706f448fce"
integrity sha512-GQ6DfMTuUsy9oWOjrzBNL/aLgVy6ef/vS1j0iILTaaAc0tojeMIs5LNQMVc0aclcuuKnzuv9jXrBcpc045JWgQ==

typical@^4.0.0:
version "4.0.0"
Expand Down

0 comments on commit 91c36ee

Please sign in to comment.