fix updating items in the quick-pick menu

Signed-off-by: Igor Vinokur <ivinokur@redhat.com>
eclipse-theia · Sep 6, 2021 · e7865da · e7865da
1 parent d350116
commit e7865da
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 7 deletions.
diff --git a/packages/core/src/browser/quick-input/quick-input-service.ts b/packages/core/src/browser/quick-input/quick-input-service.ts
@@ -206,6 +206,7 @@ export interface QuickInputService {
         Promise<(O extends { canPickMany: true } ? T[] : T) | undefined>;
     showQuickPick<T extends QuickPickItem>(items: Array<T>, options?: QuickPickOptions<T>): Promise<T>;
     hide(): void;
+    getCurrentInput(): QuickInput | undefined;
 }
 
 /**

diff --git a/packages/monaco/src/browser/monaco-quick-input-service.ts b/packages/monaco/src/browser/monaco-quick-input-service.ts
@@ -16,8 +16,19 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import {
-    InputBox, InputOptions, KeybindingRegistry, PickOptions,
-    QuickInputButton, QuickInputService, QuickPick, QuickPickItem, QuickPickItemButtonEvent, QuickPickItemHighlights, QuickPickOptions, QuickPickSeparator
+    InputBox,
+    InputOptions,
+    KeybindingRegistry,
+    PickOptions,
+    QuickInput,
+    QuickInputButton,
+    QuickInputService,
+    QuickPick,
+    QuickPickItem,
+    QuickPickItemButtonEvent,
+    QuickPickItemHighlights,
+    QuickPickOptions,
+    QuickPickSeparator
 } from '@theia/core/lib/browser';
 import { CancellationToken, Event } from '@theia/core/lib/common';
 import { injectable, inject } from '@theia/core/shared/inversify';
@@ -162,6 +173,7 @@ export class MonacoQuickInputImplementation implements monaco.quickInput.IQuickI
 export class MonacoQuickInputService implements QuickInputService {
     @inject(MonacoQuickInputImplementation)
     private monacoService: MonacoQuickInputImplementation;
+    private quickInput: QuickInput;
 
     @inject(KeybindingRegistry)
     protected readonly keybindingRegistry: KeybindingRegistry;
@@ -190,9 +202,10 @@ export class MonacoQuickInputService implements QuickInputService {
     }
 
     showQuickPick<T extends QuickPickItem>(items: T[], options?: QuickPickOptions<T>): Promise<T> {
+        const quickPick = this.monacoService.createQuickPick<MonacoQuickPickItem<T>>();
+        const wrapped = this.wrapQuickPick(quickPick);
+        this.quickInput = wrapped;
         return new Promise<T>((resolve, reject) => {
-            const quickPick = this.monacoService.createQuickPick<MonacoQuickPickItem<T>>();
-            const wrapped = this.wrapQuickPick(quickPick);
 
             if (options) {
                 wrapped.canSelectMany = !!options.canSelectMany;
@@ -272,6 +285,10 @@ export class MonacoQuickInputService implements QuickInputService {
     hide(): void {
         return this.monacoService.hide();
     }
+
+    getCurrentInput(): QuickInput | undefined {
+        return this.quickInput;
+    }
 }
 
 class MonacoQuickInput {

diff --git a/packages/plugin-ext/src/main/browser/quick-open-main.ts b/packages/plugin-ext/src/main/browser/quick-open-main.ts
@@ -336,6 +336,10 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
             matchOnLabel: true,
             runIfSingle: false,
         });
+        const input = this.quickInputService.getCurrentInput();
+        if (input) {
+            this.sessions.set(sessionId, { input, handlesToItems: new Map() });
+        }
     }
 
     $hide(): void {

diff --git a/packages/plugin-ext/src/plugin/quick-open.ts b/packages/plugin-ext/src/plugin/quick-open.ts
@@ -608,14 +608,21 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
         return this._items;
     }
 
-    set items(items: T[]) {
-        this._items = items.slice();
+    set items(pickItems: T[]) {
+        this._items = pickItems.slice();
         this._handlesToItems.clear();
         this._itemsToHandles.clear();
-        items.forEach((item, i) => {
+        pickItems.forEach((item, i) => {
             this._handlesToItems.set(i, item);
             this._itemsToHandles.set(item, i);
         });
+        const items: T[] = [];
+        for (let handle = 0; handle < pickItems.length; handle++) {
+            const item: any = {};
+            Object.assign(item, pickItems[handle]);
+            item.value = handle;
+            items.push(item);
+        }
         this.update({
             items
         });