Fix PR feedback

Author: Dave Bartolomeo

extensions/ql-vscode/src/cli.ts

@@ -448,6 +448,11 @@ export class CodeQLCliServer implements Disposable {
     // Spawn the CodeQL process
     const codeqlPath = await this.getCodeQlPath();
     const childPromise = spawn(codeqlPath, args);
+    // Avoid a runtime message about unhandled rejection.
+    childPromise.catch(() => {
+      /**/
+    });
+
     const child = childPromise.childProcess;
 
     let cancellationRegistration: Disposable | undefined = undefined;
@@ -469,13 +474,9 @@ export class CodeQLCliServer implements Disposable {
       ])) {
         yield event;
       }
+
+      await childPromise;
     } finally {
-      try {
-        await childPromise;
-      } catch (_e) {
-        // We need to await this to avoid an unhandled rejection, but we want to propagate the
-        // original exception.
-      }
       if (cancellationRegistration !== undefined) {
         cancellationRegistration.dispose();
       }

extensions/ql-vscode/src/test-adapter.ts

@@ -261,7 +261,9 @@ export class QLTestAdapter extends DisposableObject implements TestAdapter {
             ].join("\n")
           : [
               "",
-              `${event.failureStage?.toLowerCase()} error: ${event.test}`,
+              `${event.failureStage?.toLowerCase() ?? "unknown stage"} error: ${
+                event.test
+              }`,
               event.failureDescription ||
                 `${event.messages[0].severity}: ${event.messages[0].message}`,
               "",

extensions/ql-vscode/src/test-manager.ts

@@ -155,7 +155,7 @@ export class TestManager extends TestManagerBase {
     if (node.uri === undefined || node.uri.scheme !== "file") {
       throw new Error("Selected test is not a CodeQL test.");
     }
-    return node.uri!.fsPath;
+    return node.uri.fsPath;
   }
 
   /** Start tracking tests in the specified workspace folders. */
@@ -256,9 +256,9 @@ export class TestManager extends TestManagerBase {
     const testRun = this.testController.createTestRun(request, undefined, true);
     try {
       const tests: string[] = [];
-      testsToRun.forEach((t) => {
-        testRun.enqueued(t);
-        tests.push(t.uri!.fsPath);
+      testsToRun.forEach((testItem, testPath) => {
+        testRun.enqueued(testItem);
+        tests.push(testPath);
       });
 
       const logger = new TestRunLogger(testRun);