Don't show empty debugger list when there isn't any debug config

Signed-off-by: Vladyslav Zhukovskyi <[email protected]>
eclipse-theia · Jan 14, 2020 · a38a49f · a38a49f
1 parent 43e5025
commit a38a49f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/core/src/browser/quick-open/quick-pick-service-impl.ts b/packages/core/src/browser/quick-open/quick-pick-service-impl.ts
@@ -38,6 +38,10 @@ export class QuickPickServiceImpl implements QuickPickService {
     async show(elements: (string | QuickPickItem<Object>)[], options?: QuickPickOptions): Promise<Object | undefined> {
         return new Promise<Object | undefined>(resolve => {
             this.items = this.toItems(elements, resolve);
+            if (this.items.length === 0) {
+                resolve(undefined);
+                return;
+            }
             // Set `runIfSingle` to the value passed through options, else defaults to true.
             const runIfSingle: boolean = (options && options.runIfSingle !== undefined) ? options.runIfSingle : true;
             if (runIfSingle && this.items.length === 1) {

diff --git a/packages/debug/src/browser/debug-configuration-manager.ts b/packages/debug/src/browser/debug-configuration-manager.ts
@@ -312,9 +312,6 @@ export class DebugConfigurationManager {
         }
         const { languageId } = widget.editor.document;
         const debuggers = await this.debug.getDebuggersForLanguage(languageId);
-        if (debuggers && debuggers.length === 0) {
-            return undefined;
-        }
         return this.quickPick.show(debuggers.map(
             ({ label, type }) => ({ label, value: type }),
             { placeholder: 'Select Environment' })