Re-apply formatting to all files

Author: aeisenberg

extensions/ql-vscode/package.json

@@ -580,7 +580,7 @@
     "integration": "node ./out/vscode-tests/run-integration-tests.js",
     "update-vscode": "node ./node_modules/vscode/bin/install",
     "postinstall": "npm rebuild && node ./node_modules/vscode/bin/install",
-    "format": "tsfmt -r",
+    "format": "tsfmt -r && eslint src test --ext .ts,.tsx --fix",
     "lint": "eslint src test --ext .ts,.tsx --max-warnings=0",
     "format-staged": "lint-staged"
   },

extensions/ql-vscode/src/compare/compare-interface.ts

@@ -1,27 +1,27 @@
-import { DisposableObject } from "semmle-vscode-utils";
+import { DisposableObject } from '@github/codeql-vscode-utils';
 import {
   WebviewPanel,
   ExtensionContext,
   window as Window,
   ViewColumn,
   Uri,
-} from "vscode";
-import * as path from "path";
+} from 'vscode';
+import * as path from 'path';
 
-import { tmpDir } from "../run-queries";
-import { CompletedQuery } from "../query-results";
+import { tmpDir } from '../run-queries';
+import { CompletedQuery } from '../query-results';
 import {
   FromCompareViewMessage,
   ToCompareViewMessage,
   QueryCompareResult,
-} from "../interface-types";
-import { Logger } from "../logging";
-import { CodeQLCliServer } from "../cli";
-import { DatabaseManager } from "../databases";
-import { getHtmlForWebview, jumpToLocation } from "../interface-utils";
-import { adaptSchema, adaptBqrs, RawResultSet } from "../adapt";
-import { BQRSInfo } from "../bqrs-cli-types";
-import resultsDiff from "./resultsDiff";
+} from '../interface-types';
+import { Logger } from '../logging';
+import { CodeQLCliServer } from '../cli';
+import { DatabaseManager } from '../databases';
+import { getHtmlForWebview, jumpToLocation } from '../interface-utils';
+import { adaptSchema, adaptBqrs, RawResultSet } from '../adapt';
+import { BQRSInfo } from '../bqrs-cli-types';
+import resultsDiff from './resultsDiff';
 
 interface ComparePair {
   from: CompletedQuery;
@@ -67,7 +67,7 @@ export class CompareInterfaceManager extends DisposableObject {
     );
     if (currentResultSetName) {
       await this.postMessage({
-        t: "setComparisons",
+        t: 'setComparisons',
         stats: {
           fromQuery: {
             // since we split the description into several rows
@@ -100,16 +100,16 @@ export class CompareInterfaceManager extends DisposableObject {
     if (this.panel == undefined) {
       const { ctx } = this;
       const panel = (this.panel = Window.createWebviewPanel(
-        "compareView",
-        "Compare CodeQL Query Results",
+        'compareView',
+        'Compare CodeQL Query Results',
         { viewColumn: ViewColumn.Active, preserveFocus: true },
         {
           enableScripts: true,
           enableFindWidget: true,
           retainContextWhenHidden: true,
           localResourceRoots: [
             Uri.file(tmpDir.name),
-            Uri.file(path.join(this.ctx.extensionPath, "out")),
+            Uri.file(path.join(this.ctx.extensionPath, 'out')),
           ],
         }
       ));
@@ -123,11 +123,11 @@ export class CompareInterfaceManager extends DisposableObject {
       );
 
       const scriptPathOnDisk = Uri.file(
-        ctx.asAbsolutePath("out/compareView.js")
+        ctx.asAbsolutePath('out/compareView.js')
       );
 
       const stylesheetPathOnDisk = Uri.file(
-        ctx.asAbsolutePath("out/resultsView.css")
+        ctx.asAbsolutePath('out/resultsView.css')
       );
 
       panel.webview.html = getHtmlForWebview(
@@ -158,21 +158,21 @@ export class CompareInterfaceManager extends DisposableObject {
     msg: FromCompareViewMessage
   ): Promise<void> {
     switch (msg.t) {
-      case "compareViewLoaded":
+      case 'compareViewLoaded':
         this.panelLoaded = true;
         this.panelLoadedCallBacks.forEach((cb) => cb());
         this.panelLoadedCallBacks = [];
         break;
 
-      case "changeCompare":
+      case 'changeCompare':
         this.changeTable(msg.newResultSetName);
         break;
 
-      case "viewSourceFile":
+      case 'viewSourceFile':
         await jumpToLocation(msg, this.databaseManager, this.logger);
         break;
 
-      case "openQuery":
+      case 'openQuery':
         await this.openQuery(msg.kind);
         break;
     }
@@ -193,10 +193,10 @@ export class CompareInterfaceManager extends DisposableObject {
     const toSchemas = await this.cliServer.bqrsInfo(
       to.query.resultsPaths.resultsPath
     );
-    const fromSchemaNames = fromSchemas["result-sets"].map(
+    const fromSchemaNames = fromSchemas['result-sets'].map(
       (schema) => schema.name
     );
-    const toSchemaNames = toSchemas["result-sets"].map(
+    const toSchemaNames = toSchemas['result-sets'].map(
       (schema) => schema.name
     );
     const commonResultSetNames = fromSchemaNames.filter((name) =>
@@ -238,7 +238,7 @@ export class CompareInterfaceManager extends DisposableObject {
     resultSetName: string,
     resultsPath: string
   ): Promise<RawResultSet> {
-    const schema = bqrsInfo["result-sets"].find(
+    const schema = bqrsInfo['result-sets'].find(
       (schema) => schema.name === resultSetName
     );
     if (!schema) {
@@ -260,9 +260,9 @@ export class CompareInterfaceManager extends DisposableObject {
     return resultsDiff(fromResults, toResults);
   }
 
-  private openQuery(kind: "from" | "to") {
+  private openQuery(kind: 'from' | 'to') {
     const toOpen =
-      kind === "from" ? this.comparePair?.from : this.comparePair?.to;
+      kind === 'from' ? this.comparePair?.from : this.comparePair?.to;
     if (toOpen) {
       this.showQueryResultsCallback(toOpen);
     }

extensions/ql-vscode/src/compare/resultsDiff.ts

@@ -1,5 +1,5 @@
-import { RawResultSet } from "../adapt";
-import { QueryCompareResult } from "../interface-types";
+import { RawResultSet } from '../adapt';
+import { QueryCompareResult } from '../interface-types';
 
 /**
  * Compare the rows of two queries. Use deep equality to determine if
@@ -25,15 +25,15 @@ export default function resultsDiff(
 ): QueryCompareResult {
 
   if (fromResults.schema.columns.length !== toResults.schema.columns.length) {
-    throw new Error("CodeQL Compare: Columns do not match.");
+    throw new Error('CodeQL Compare: Columns do not match.');
   }
 
   if (!fromResults.rows.length) {
-    throw new Error("CodeQL Compare: Source query has no results.");
+    throw new Error('CodeQL Compare: Source query has no results.');
   }
 
   if (!toResults.rows.length) {
-    throw new Error("CodeQL Compare: Target query has no results.");
+    throw new Error('CodeQL Compare: Target query has no results.');
   }
 
   const results = {
@@ -45,7 +45,7 @@ export default function resultsDiff(
     fromResults.rows.length === results.from.length &&
     toResults.rows.length === results.to.length
   ) {
-    throw new Error("CodeQL Compare: No overlap between the selected queries.");
+    throw new Error('CodeQL Compare: No overlap between the selected queries.');
   }
 
   return results;

extensions/ql-vscode/src/compare/view/Compare.tsx

@@ -1,29 +1,29 @@
-import * as React from "react";
-import { useState, useEffect } from "react";
-import * as Rdom from "react-dom";
+import * as React from 'react';
+import { useState, useEffect } from 'react';
+import * as Rdom from 'react-dom';
 
-import RawTableHeader from "../../view/RawTableHeader";
+import RawTableHeader from '../../view/RawTableHeader';
 import {
   ToCompareViewMessage,
   SetComparisonsMessage,
-} from "../../interface-types";
-import CompareSelector from "./CompareSelector";
-import { vscode } from "../../view/vscode-api";
-import RawTableRow from "../../view/RawTableRow";
-import { ResultRow } from "../../adapt";
-import { className } from "../../view/result-table-utils";
+} from '../../interface-types';
+import CompareSelector from './CompareSelector';
+import { vscode } from '../../view/vscode-api';
+import RawTableRow from '../../view/RawTableRow';
+import { ResultRow } from '../../adapt';
+import { className } from '../../view/result-table-utils';
 
 const emptyComparison: SetComparisonsMessage = {
-  t: "setComparisons",
+  t: 'setComparisons',
   stats: {},
   rows: {
     from: [],
     to: [],
   },
   columns: [],
   commonResultSetNames: [],
-  currentResultSetName: "",
-  datebaseUri: "",
+  currentResultSetName: '',
+  datebaseUri: '',
 };
 
 export function Compare(props: {}): JSX.Element {
@@ -32,10 +32,10 @@ export function Compare(props: {}): JSX.Element {
   );
 
   useEffect(() => {
-    window.addEventListener("message", (evt: MessageEvent) => {
+    window.addEventListener('message', (evt: MessageEvent) => {
       const msg: ToCompareViewMessage = evt.data;
       switch (msg.t) {
-        case "setComparisons":
+        case 'setComparisons':
           setComparison(msg);
       }
     });
@@ -53,7 +53,7 @@ export function Compare(props: {}): JSX.Element {
             availableResultSets={comparison.commonResultSetNames}
             currentResultSetName={comparison.currentResultSetName}
             updateResultSet={(newResultSetName: string) =>
-              vscode.postMessage({ t: "changeCompare", newResultSetName })
+              vscode.postMessage({ t: 'changeCompare', newResultSetName })
             }
           />
         </div>
@@ -62,15 +62,15 @@ export function Compare(props: {}): JSX.Element {
             <tr>
               <td>
                 <a
-                  onClick={() => openQuery("from")}
+                  onClick={() => openQuery('from')}
                   className="vscode-codeql__compare-open"
                 >
                   {comparison.stats.fromQuery?.name}
                 </a>
               </td>
               <td>
                 <a
-                  onClick={() => openQuery("to")}
+                  onClick={() => openQuery('to')}
                   className="vscode-codeql__compare-open"
                 >
                   {comparison.stats.toQuery?.name}
@@ -119,9 +119,9 @@ export function Compare(props: {}): JSX.Element {
   }
 }
 
-async function openQuery(kind: "from" | "to") {
+async function openQuery(kind: 'from' | 'to') {
   vscode.postMessage({
-    t: "openQuery",
+    t: 'openQuery',
     kind,
   });
 }
@@ -143,7 +143,7 @@ function createRows(rows: ResultRow[], databaseUri: string) {
 
 Rdom.render(
   <Compare />,
-  document.getElementById("root"),
+  document.getElementById('root'),
   // Post a message to the extension when fully loaded.
-  () => vscode.postMessage({ t: "compareViewLoaded" })
+  () => vscode.postMessage({ t: 'compareViewLoaded' })
 );

extensions/ql-vscode/src/compare/view/CompareSelector.tsx

@@ -1,4 +1,4 @@
-import * as React from "react";
+import * as React from 'react';
 
 interface Props {
   availableResultSets: string[];