Automatically fix ESLint violations

extensions/ql-vscode/src/codeql-cli/distribution.ts

@@ -195,9 +195,8 @@ export class DistributionManager implements DistributionProvider {
 
     if (process.env.PATH) {
       for (const searchDirectory of process.env.PATH.split(delimiter)) {
-        const expectedLauncherPath = await getExecutableFromDirectory(
+        const expectedLauncherPath =
-          searchDirectory,
+          await getExecutableFromDirectory(searchDirectory);
-        );
         if (expectedLauncherPath) {
           return {
             codeQlPath: expectedLauncherPath,

extensions/ql-vscode/src/common/readonly.ts

@@ -1,11 +1,11 @@
 export type DeepReadonly<T> = T extends Array<infer R>
   ? DeepReadonlyArray<R>
   : // eslint-disable-next-line @typescript-eslint/ban-types
-  T extends Function
+    T extends Function
-  ? T
+    ? T
-  : T extends object
+    : T extends object
-  ? DeepReadonlyObject<T>
+      ? DeepReadonlyObject<T>
-  : T;
+      : T;
 
 interface DeepReadonlyArray<T> extends ReadonlyArray<DeepReadonly<T>> {}
 

extensions/ql-vscode/src/common/sarif-utils.ts

@@ -232,14 +232,14 @@ export function parseHighlightedLine(
   const highlightStartColumn = isSingleLineHighlight
     ? highlightedRegion.startColumn
     : isFirstHighlightedLine
-    ? highlightedRegion.startColumn
+      ? highlightedRegion.startColumn
-    : 0;
+      : 0;
 
   const highlightEndColumn = isSingleLineHighlight
     ? highlightedRegion.endColumn
     : isLastHighlightedLine
-    ? highlightedRegion.endColumn
+      ? highlightedRegion.endColumn
-    : line.length + 1;
+      : line.length + 1;
 
   const plainSection1 = line.substring(0, highlightStartColumn - 1);
   const highlightedSection = line.substring(

extensions/ql-vscode/src/common/vscode/telemetry.ts

@@ -162,8 +162,8 @@ export class ExtensionTelemetryListener
     const status = !error
       ? CommandCompletion.Success
       : error instanceof UserCancellationException
-      ? CommandCompletion.Cancelled
+        ? CommandCompletion.Cancelled
-      : CommandCompletion.Failed;
+        : CommandCompletion.Failed;
 
     this.reporter.sendTelemetryEvent(
       "command-usage",

extensions/ql-vscode/src/databases/local-databases/database-manager.ts

@@ -424,9 +424,8 @@ export class DatabaseManager extends DisposableObject {
             step: ++step,
           });
 
-          const databaseItem = await this.createDatabaseItemFromPersistedState(
+          const databaseItem =
-            database,
+            await this.createDatabaseItemFromPersistedState(database);
-          );
           try {
             await this.refreshDatabase(databaseItem);
             await this.registerDatabase(databaseItem);

extensions/ql-vscode/src/extension.ts

@@ -542,8 +542,8 @@ async function installOrUpdateDistribution(
   const messageText = willUpdateCodeQl
     ? "Updating CodeQL CLI"
     : codeQlInstalled
-    ? "Checking for updates to CodeQL CLI"
+      ? "Checking for updates to CodeQL CLI"
-    : "Installing CodeQL CLI";
+      : "Installing CodeQL CLI";
 
   try {
     await installOrUpdateDistributionWithProgressTitle(
@@ -564,8 +564,8 @@ async function installOrUpdateDistribution(
       willUpdateCodeQl
         ? "update"
         : codeQlInstalled
-        ? "check for updates to"
+          ? "check for updates to"
-        : "install"
+          : "install"
     } CodeQL CLI`;
 
     if (e instanceof GithubRateLimitedError) {

extensions/ql-vscode/src/local-queries/results-view.ts

@@ -106,9 +106,9 @@ function sortInterpretedResults(
           a.message.text === undefined
             ? 0
             : b.message.text === undefined
-            ? 0
+              ? 0
-            : multiplier *
+              : multiplier *
-              a.message.text?.localeCompare(b.message.text, env.language),
+                a.message.text?.localeCompare(b.message.text, env.language),
         );
         break;
       default:

extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts

@@ -507,9 +507,8 @@ export class SkeletonQueryWizard {
   ): Promise<DatabaseItem | undefined> {
     const defaultDatabaseNwo = QUERY_LANGUAGE_TO_DATABASE_REPO[language];
 
-    const dbItems = await SkeletonQueryWizard.sortDatabaseItemsByDateAdded(
+    const dbItems =
-      databaseItems,
+      await SkeletonQueryWizard.sortDatabaseItemsByDateAdded(databaseItems);
-    );
 
     const defaultDatabaseItem = await SkeletonQueryWizard.findDatabaseItemByNwo(
       language,

extensions/ql-vscode/src/model-editor/auto-model-codeml-queries.ts

@@ -85,9 +85,8 @@ export async function runAutoModelQueries({
   // CodeQL needs to have access to the database to be able to retrieve the
   // snippets from it. The source location prefix is used to determine the
   // base path of the database.
-  const sourceLocationPrefix = await databaseItem.getSourceLocationPrefix(
+  const sourceLocationPrefix =
-    cliServer,
+    await databaseItem.getSourceLocationPrefix(cliServer);
-  );
   const sourceArchiveUri = databaseItem.sourceArchive;
   const sourceInfo =
     sourceArchiveUri === undefined

extensions/ql-vscode/src/model-editor/model-editor-view.ts

@@ -482,9 +482,8 @@ export class ModelEditorView extends AbstractWebview<
         // In application mode, we need the database of a specific library to generate
         // the modeled methods. In framework mode, we'll use the current database.
         if (mode === Mode.Application) {
-          addedDatabase = await this.promptChooseNewOrExistingDatabase(
+          addedDatabase =
-            progress,
+            await this.promptChooseNewOrExistingDatabase(progress);
-          );
           if (!addedDatabase) {
             return;
           }
@@ -562,9 +561,8 @@ export class ModelEditorView extends AbstractWebview<
 
   private async modelDependency(): Promise<void> {
     return withProgress(async (progress, token) => {
-      const addedDatabase = await this.promptChooseNewOrExistingDatabase(
+      const addedDatabase =
-        progress,
+        await this.promptChooseNewOrExistingDatabase(progress);
-      );
       if (!addedDatabase || token.isCancellationRequested) {
         return;
       }

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

@@ -239,8 +239,8 @@ export class QLTestAdapter extends DisposableObject implements TestAdapter {
     const state = event.pass
       ? "passed"
       : event.messages?.length
-      ? "errored"
+        ? "errored"
-      : "failed";
+        : "failed";
     let message: string | undefined;
     if (event.failureDescription || event.diff?.length) {
       message =

extensions/ql-vscode/src/variant-analysis/export-results.ts

@@ -45,9 +45,8 @@ export async function exportVariantAnalysisResults(
 ): Promise<void> {
   await withProgress(
     async (progress: ProgressCallback, token: CancellationToken) => {
-      const variantAnalysis = await variantAnalysisManager.getVariantAnalysis(
+      const variantAnalysis =
-        variantAnalysisId,
+        await variantAnalysisManager.getVariantAnalysis(variantAnalysisId);
-      );
       if (!variantAnalysis) {
         void extLogger.log(
           `Could not find variant analysis with id ${variantAnalysisId}`,
@@ -61,9 +60,8 @@ export async function exportVariantAnalysisResults(
         throw new UserCancellationException("Cancelled");
       }
 
-      const repoStates = await variantAnalysisManager.getRepoStates(
+      const repoStates =
-        variantAnalysisId,
+        await variantAnalysisManager.getRepoStates(variantAnalysisId);
-      );
 
       void extLogger.log(
         `Exporting variant analysis results for variant analysis with id ${variantAnalysis.id}`,

extensions/ql-vscode/src/variant-analysis/run-remote-query.ts

@@ -183,9 +183,8 @@ async function copyExistingQueryPack(
   if (
     await cliServer.cliConstraints.supportsGenerateExtensiblePredicateMetadata()
   ) {
-    const metadata = await cliServer.generateExtensiblePredicateMetadata(
+    const metadata =
-      originalPackRoot,
+      await cliServer.generateExtensiblePredicateMetadata(originalPackRoot);
-    );
     metadata.extensible_predicates.forEach((predicate) => {
       if (predicate.path.endsWith(".ql")) {
         toCopy.push(join(originalPackRoot, predicate.path));

extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts

@@ -21,9 +21,8 @@ export const createVariantAnalysisContentProvider = (
     }
     const variantAnalysisId = parseInt(variantAnalysisIdString);
 
-    const variantAnalysis = await variantAnalysisManager.getVariantAnalysis(
+    const variantAnalysis =
-      variantAnalysisId,
+      await variantAnalysisManager.getVariantAnalysis(variantAnalysisId);
-    );
     if (!variantAnalysis) {
       void showAndLogWarningMessage(
         extLogger,

extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts

@@ -180,9 +180,8 @@ export class VariantAnalysisResultsManager extends DisposableObject {
       repositoryFullName,
     );
 
-    const repoTask: VariantAnalysisRepositoryTask = await readRepoTask(
+    const repoTask: VariantAnalysisRepositoryTask =
-      storageDirectory,
+      await readRepoTask(storageDirectory);
-    );
 
     if (!repoTask.databaseCommitSha || !repoTask.sourceLocationPrefix) {
       throw new Error("Missing database commit SHA");