Apply suggestions from code review

extensions/ql-vscode/src/databases-ui.ts

@@ -393,7 +393,6 @@ export class DatabaseUI extends DisposableObject {
       await this.chooseAndSetDatabase(true, progress, token);
     } catch (e) {
       void showAndLogErrorMessage(getErrorMessage(e));
-      return undefined;
     }
   };
 
@@ -461,7 +460,6 @@ export class DatabaseUI extends DisposableObject {
       await this.chooseAndSetDatabase(false, progress, token);
     } catch (e) {
       void showAndLogErrorMessage(getErrorMessage(e));
-      return undefined;
     }
   };
 

extensions/ql-vscode/src/json-rpc-server.ts

@@ -10,14 +10,14 @@ export class ServerProcess implements Disposable {
   connection: MessageConnection;
   logger: Logger;
 
-  constructor(child: cp.ChildProcess, connection: MessageConnection, logger: Logger) {
+  constructor(child: cp.ChildProcess, connection: MessageConnection, private name: string, logger: Logger) {
     this.child = child;
     this.connection = connection;
     this.logger = logger;
   }
 
   dispose(): void {
-    void this.logger.log('Stopping query server...');
+    void this.logger.log(`Stopping ${this.name}...`);
     this.connection.dispose();
     this.child.stdin!.end();
     this.child.stderr!.destroy();
@@ -25,6 +25,6 @@ export class ServerProcess implements Disposable {
 
     // On Windows, we usually have to terminate the process before closing its stdout.
     this.child.stdout!.destroy();
-    void this.logger.log('Stopped query server.');
+    void this.logger.log(`Stopped ${this.name}.`);
   }
 }

extensions/ql-vscode/src/legacy-query-server/queryserver-client.ts

@@ -176,7 +176,7 @@ export class QueryServerClient extends DisposableObject {
         callback(res);
       }
     });
-    this.serverProcess = new ServerProcess(child, connection, this.logger);
+    this.serverProcess = new ServerProcess(child, connection, 'Query server', this.logger);
     // Ensure the server process is disposed together with this client.
     this.track(this.serverProcess);
     connection.listen();

extensions/ql-vscode/src/legacy-query-server/run-queries.ts

@@ -37,7 +37,7 @@ export class QueryInProgress {
 
   public queryEvalInfo: QueryEvaluationInfo;
   /**
-   * Note that in the {@link FullQueryInfo.slurp} method, we create a QueryEvaluationInfo instance
+   * Note that in the {@link slurpQueryHistory} method, we create a QueryEvaluationInfo instance
    * by explicitly setting the prototype in order to avoid calling this constructor.
    */
   constructor(
@@ -515,4 +515,3 @@ function createSimpleTemplates(templates: Record<string, string> | undefined): m
   }
   return result;
 }
-

extensions/ql-vscode/src/query-results.ts

@@ -75,7 +75,7 @@ export class CompletedQueryInfo implements QueryWithResults {
   interpretedResultsSortState: InterpretedResultsSortState | undefined;
 
   /**
-   * Note that in the {@link FullQueryInfo.slurp} method, we create a CompletedQueryInfo instance
+   * Note that in the {@link slurpQueryHistory} method, we create a CompletedQueryInfo instance
    * by explicitly setting the prototype in order to avoid calling this constructor.
    */
   constructor(

extensions/ql-vscode/src/run-queries-shared.ts

@@ -62,7 +62,7 @@ function findQueryEvalLogEndSummaryFile(resultPath: string): string {
 export class QueryEvaluationInfo {
 
   /**
-   * Note that in the {@link FullQueryInfo.slurp} method, we create a QueryEvaluationInfo instance
+   * Note that in the {@link slurpQueryHistory} method, we create a QueryEvaluationInfo instance
    * by explicitly setting the prototype in order to avoid calling this constructor.
    */
   constructor(
@@ -213,7 +213,7 @@ export class QueryEvaluationInfo {
   async addQueryLogs(queryInfo: LocalQueryInfo, cliServer: CodeQLCliServer, logger: Logger) {
     queryInfo.evalLogLocation = this.evalLogPath;
     queryInfo.evalLogSummaryLocation = await this.generateHumanReadableLogSummary(cliServer);
-    void this.logEndSummary(queryInfo.evalLogSummaryLocation, logger);  // Logged asynchrnously   
+    void this.logEndSummary(queryInfo.evalLogSummaryLocation, logger);  // Logged asynchrnously
     if (config.isCanary()) { // Generate JSON summary for viewer.
       await cliServer.generateJsonLogSummary(this.evalLogPath, this.jsonEvalLogSummaryPath);
       queryInfo.jsonEvalLogSummaryLocation = this.jsonEvalLogSummaryPath;
@@ -582,4 +582,3 @@ export async function createInitialQueryInfo(
     })
   };
 }
-