Only cache project attributes in case of successful retrieval

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));
 }