Merge branch 'topic/gnattest' into 'master'

Only cache project attributes in case of successful retrieval

See merge request eng/ide/ada_language_server!1975

Author: eliericha

integration/vscode/ada/src/ExtensionState.ts

@@ -411,12 +411,15 @@ export class ExtensionState {
                 arguments: [queryArgs],
             };
 
-            const queryPromise = this.adaClient.sendRequest(
-                ExecuteCommandRequest.type,
-                params,
-            ) as Promise<string | string[]>;
-
-            this.projectAttributeCache.set(mapKey, queryPromise);
+            const queryPromise = this.adaClient
+                .sendRequest(ExecuteCommandRequest.type, params)
+                .then((value) => {
+                    /**
+                     * Only cache the promise if it was fulfilled.
+                     */
+                    this.projectAttributeCache.set(mapKey, queryPromise);
+                    return value as string | string[];
+                });
 
             return queryPromise;
         } else {

integration/vscode/ada/src/gnattest.ts

@@ -171,7 +171,15 @@ export async function getHarnessDir() {
             /**
              * default to gnattest/harness if Harness_Dir is unspecified
              */
-            () => path.join('gnattest', 'harness'),
+            (err) => {
+                if (err instanceof Error && err.message == 'The queried attribute is not known') {
+                    return path.join('gnattest', 'harness');
+                } else {
+                    // Reject the promise with the same error.
+                    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
+                    return Promise.reject(err);
+                }
+            },
         )
         .then(async (value) => path.join(await adaExtState.getObjectDir(), value as string));
 }
@@ -878,7 +886,7 @@ async function buildTestDriverAndReportErrors(
 
         buildTasks.push(instTask, buildTask);
     } else {
-        const task = await findTaskByName(`${TASK_BUILD_TEST_DRIVER}`);
+        const task = await findTaskByName(`${TASK_TYPE_ADA}: ${TASK_BUILD_TEST_DRIVER}`);
         buildTasks.push(task);
     }
 

integration/vscode/ada/src/taskProviders.ts

@@ -404,8 +404,14 @@ export class SimpleTaskProvider implements vscode.TaskProvider {
         }
 
         const result: vscode.Task[] = [];
-        const targetPrefix = await adaExtState.getTargetPrefix();
-        const isNativeProject = await adaExtState.isNativeProject();
+        const targetPrefix = await adaExtState.getTargetPrefix().catch((err) => {
+            logger.error('Error in task provider:\n' + err);
+            return '';
+        });
+        const isNativeProject = await adaExtState.isNativeProject().catch((err) => {
+            logger.error('Error in task provider:\n' + err);
+            return true;
+        });
 
         /**
          * Start with the list of predefined tasks.
@@ -417,7 +423,12 @@ export class SimpleTaskProvider implements vscode.TaskProvider {
              * Add tasks based on the Mains of the project.
              */
             taskDeclsToOffer.push(
-                ...(await getAdaMains()).flatMap((main) => {
+                ...(
+                    await getAdaMains().catch((err) => {
+                        logger.error('Error in task provider:\n' + err);
+                        return [];
+                    })
+                ).flatMap((main) => {
                     if (token?.isCancellationRequested) {
                         throw new vscode.CancellationError();
                     }