From 8db8e63b449eceacb986845b55e0bd473173c3aa Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 11 Apr 2023 14:50:16 -0700 Subject: [PATCH] Pick up latest TS for building VS Code (#179714) --- extensions/references-view/src/tree.ts | 2 +- package.json | 4 ++-- .../browser/view/renderers/webviewPreloads.ts | 4 ++-- yarn.lock | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extensions/references-view/src/tree.ts b/extensions/references-view/src/tree.ts index 0c005237d45..2a4a0e924af 100644 --- a/extensions/references-view/src/tree.ts +++ b/extensions/references-view/src/tree.ts @@ -268,7 +268,7 @@ class TreeInputHistory implements vscode.TreeDataProvider{ vscode.commands.registerCommand('_references-view.showHistoryItem', async (item) => { if (item instanceof HistoryItem) { const position = item.anchor.guessedTrackedPosition() ?? item.input.location.range.start; - return vscode.commands.executeCommand('vscode.open', item.input.location.uri, { selection: new vscode.Range(position, position) }); + await vscode.commands.executeCommand('vscode.open', item.input.location.uri, { selection: new vscode.Range(position, position) }); } }), vscode.commands.registerCommand('references-view.pickFromHistory', async () => { diff --git a/package.json b/package.json index 4679706e364..d3843fb462f 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "@types/trusted-types": "^1.0.6", "@types/vscode-notebook-renderer": "^1.72.0", "@types/webpack": "^5.28.1", - "@types/wicg-file-system-access": "^2020.9.5", + "@types/wicg-file-system-access": "^2020.9.6", "@types/windows-foreground-love": "^0.3.0", "@types/winreg": "^1.2.30", "@types/yauzl": "^2.9.1", @@ -204,7 +204,7 @@ "ts-loader": "^9.4.2", "ts-node": "^10.9.1", "tsec": "0.1.4", - "typescript": "^5.1.0-dev.20230328", + "typescript": "^5.1.0-dev.20230411", "typescript-formatter": "7.1.0", "underscore": "^1.12.1", "util": "^0.12.4", diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts index c188aa78327..af6ded6384c 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts @@ -1638,9 +1638,9 @@ async function webviewPreloads(ctx: PreloadContext) { const controller = new AbortController(); this.outputs.set(outputId, { abort: controller, queue: new Promise(r => r(action(controller.signal))) }); } else { - record.queue = record.queue.then(r => { + record.queue = record.queue.then(async r => { if (!record.abort.signal.aborted) { - return action(record.abort.signal); + await action(record.abort.signal); } }); } diff --git a/yarn.lock b/yarn.lock index ad540756d5a..0522a5dbe8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1143,10 +1143,10 @@ tapable "^2.2.0" webpack "^5" -"@types/wicg-file-system-access@^2020.9.5": - version "2020.9.5" - resolved "https://registry.yarnpkg.com/@types/wicg-file-system-access/-/wicg-file-system-access-2020.9.5.tgz#4a0c8f3d1ed101525f329e86c978f7735404474f" - integrity sha512-UYK244awtmcUYQfs7FR8710MJcefL2WvkyHMjA8yJzxd1mo0Gfn88sRZ1Bls7hiUhA2w7ne1gpJ9T5g3G0wOyA== +"@types/wicg-file-system-access@^2020.9.6": + version "2020.9.6" + resolved "https://registry.yarnpkg.com/@types/wicg-file-system-access/-/wicg-file-system-access-2020.9.6.tgz#da34476b1e29451c8b7aa1a6db86b185647cd970" + integrity sha512-6hogE75Hl2Ov/jgp8ZhDaGmIF/q3J07GtXf8nCJCwKTHq7971po5+DId7grft09zG7plBwpF6ZU0yx9Du4/e1A== "@types/windows-foreground-love@^0.3.0": version "0.3.0" @@ -10053,10 +10053,10 @@ typescript@^4.7.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== -typescript@^5.1.0-dev.20230328: - version "5.1.0-dev.20230328" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.0-dev.20230328.tgz#00e4f9d9ac4c7c7b17add10949a7b950ddf3f6d5" - integrity sha512-pylwLhhCSsZX72UUJTSD+5DKoEUUKsqQg6w4bLdRVbYVXDCxPLExUayWWCaRSmx9WJjf00YwMA2MXS2z2t5+2g== +typescript@^5.1.0-dev.20230411: + version "5.1.0-dev.20230411" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.0-dev.20230411.tgz#28ee14d54d82594647763172a804379e872fa6ac" + integrity sha512-3yO7RzC4rZID1/u1alMwKKAhp/kyDkFiR+73vsvK5z99GYRVbUJIy9f3w2pGNZI3K7YI5Hv1bN2XWkPgZhB2CA== typical@^4.0.0: version "4.0.0"