From a01d16e77e9b7c7f200d6010b78b519e05913d73 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 3 Feb 2021 09:44:52 +0100 Subject: [PATCH] debt - use a native private property in ExtHostQuickInput --- .../vscode-api-tests/src/singlefolder-tests/rpc.test.ts | 2 -- src/vs/workbench/api/common/extHostQuickOpen.ts | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts index 34948413be6..4cf5f1e0767 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts @@ -38,14 +38,12 @@ suite('vscode', function () { }); test('no rpc, createQuickPick(...)', function () { - this.skip(); const item = vscode.window.createQuickPick(); dispo.push(item); assertNoRpcFromEntry([item, 'QuickPick']); }); test('no rpc, createInputBox(...)', function () { - this.skip(); const item = vscode.window.createInputBox(); dispo.push(item); assertNoRpcFromEntry([item, 'InputBox']); diff --git a/src/vs/workbench/api/common/extHostQuickOpen.ts b/src/vs/workbench/api/common/extHostQuickOpen.ts index 2f2fd4cdbdb..26ccfb2fa37 100644 --- a/src/vs/workbench/api/common/extHostQuickOpen.ts +++ b/src/vs/workbench/api/common/extHostQuickOpen.ts @@ -233,6 +233,7 @@ class ExtHostQuickInput implements QuickInput { private static _nextId = 1; _id = ExtHostQuickPick._nextId++; + #proxy: MainThreadQuickOpenShape; private _title: string | undefined; private _steps: number | undefined; private _totalSteps: number | undefined; @@ -260,7 +261,8 @@ class ExtHostQuickInput implements QuickInput { this._onDidChangeValueEmitter ]; - constructor(protected _proxy: MainThreadQuickOpenShape, protected _extensionId: ExtensionIdentifier, private _onDidDispose: () => void) { + constructor(proxy: MainThreadQuickOpenShape, protected _extensionId: ExtensionIdentifier, private _onDidDispose: () => void) { + this.#proxy = proxy; } get title() { @@ -409,7 +411,7 @@ class ExtHostQuickInput implements QuickInput { this._updateTimeout = undefined; } this._onDidDispose(); - this._proxy.$dispose(this._id); + this.#proxy.$dispose(this._id); } protected update(properties: Record): void { @@ -437,7 +439,7 @@ class ExtHostQuickInput implements QuickInput { } private dispatchUpdate() { - this._proxy.$createOrUpdate(this._pendingUpdate); + this.#proxy.$createOrUpdate(this._pendingUpdate); this._pendingUpdate = { id: this._id }; } }