Merge branch 'topic/vscode-spark-picker' into 'master'

Prevent the GNATprove option picker from waiting infinitely in testing

See merge request eng/ide/ada_language_server!2098

Author: eliericha

integration/vscode/ada/.vscode-test.mjs

@@ -7,6 +7,12 @@ import * as dotenv from 'dotenv';
 dotenv.config({ override: true });
 // console.log(process.env);
 
+/**
+ * Set this env variable to tell the VS Code extension we are running in a
+ * testing environment
+ */
+process.env['ALS_VSCODE_TEST_ENV'] = '1';
+
 let baseMochaOptions = {
     ui: 'tdd',
     color: true,

integration/vscode/ada/src/helpers.ts

@@ -712,3 +712,9 @@ export function getMatchingPrefixes(
 
     return [prefix1, prefix2];
 }
+
+/**
+ * This constant indicates whether the code is running in a testing
+ * environment.
+ */
+export const inTesting = process.env['ALS_VSCODE_TEST_ENV'] === '1';

integration/vscode/ada/src/multiStepInput.ts

@@ -21,6 +21,7 @@ import {
     QuickPickItem,
     window,
 } from 'vscode';
+import { inTesting } from './helpers';
 
 // -------------------------------------------------------
 // Helper code that wraps the API for the multi-step case.
@@ -183,6 +184,19 @@ export class MultiStepInput {
                 }
                 this.current = input;
                 this.current.show();
+
+                if (inTesting) {
+                    /**
+                     * In testing, do not wait for User selection and return
+                     * the default selections immediately.
+                     */
+                    this.current.hide();
+                    if (canSelectMany) {
+                        resolve(<any>input.selectedItems.concat());
+                    } else {
+                        resolve(<any>input.selectedItems[0]);
+                    }
+                }
             });
         } finally {
             disposables.forEach((d) => d.dispose());