Merge pull request #295 from aeisenberg/aeisenberg/lint

lint: Ran the auto-fix command for the linter

Author: aeisenberg

extensions/ql-vscode/src/archive-filesystem-provider.ts

@@ -90,7 +90,7 @@ export function encodeSourceArchiveUri(ref: ZipFileReference): vscode.Uri {
   });
 }
 
-const sourceArchiveUriAuthorityPattern = /^(\d+)\-(\d+)$/;
+const sourceArchiveUriAuthorityPattern = /^(\d+)-(\d+)$/;
 
 class InvalidSourceArchiveUriError extends Error {
   constructor(uri: vscode.Uri) {
@@ -142,8 +142,8 @@ function ensureDir(map: DirectoryHierarchyMap, dir: string) {
 }
 
 type Archive = {
-  unzipped: unzipper.CentralDirectory,
-  dirMap: DirectoryHierarchyMap,
+  unzipped: unzipper.CentralDirectory;
+  dirMap: DirectoryHierarchyMap;
 };
 
 export class ArchiveFileSystemProvider implements vscode.FileSystemProvider {
@@ -192,7 +192,7 @@ export class ArchiveFileSystemProvider implements vscode.FileSystemProvider {
 
   // write operations, all disabled
 
-  writeFile(_uri: vscode.Uri, _content: Uint8Array, _options: { create: boolean, overwrite: boolean }): void {
+  writeFile(_uri: vscode.Uri, _content: Uint8Array, _options: { create: boolean; overwrite: boolean }): void {
     throw this.readOnlyError;
   }
 
@@ -257,7 +257,7 @@ export class ArchiveFileSystemProvider implements vscode.FileSystemProvider {
 
   watch(_resource: vscode.Uri): vscode.Disposable {
     // ignore, fires for all changes...
-    return new vscode.Disposable(() => { });
+    return new vscode.Disposable(() => { /**/ });
   }
 }
 

extensions/ql-vscode/src/cli.ts

@@ -245,8 +245,8 @@ export class CodeQLCliServer implements Disposable {
         // Report the error (if there is a stderr then use that otherwise just report the error cod or nodejs error)
         const newError =
           stderrBuffers.length == 0
-          ? new Error(`${description} failed: ${err}`)
-          : new Error(`${description} failed: ${Buffer.concat(stderrBuffers).toString("utf8")}`);
+            ? new Error(`${description} failed: ${err}`)
+            : new Error(`${description} failed: ${Buffer.concat(stderrBuffers).toString("utf8")}`);
         newError.stack += (err.stack || '');
         throw newError;
       } finally {

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

@@ -9,7 +9,7 @@ import { clearCacheInDatabase, UserCancellationException } from './run-queries';
 import * as qsClient from './queryserver-client';
 import { upgradeDatabase } from './upgrades';
 
-type ThemableIconPath = { light: string, dark: string } | string;
+type ThemableIconPath = { light: string; dark: string } | string;
 
 /**
  * Path to icons to display next to currently selected database.

extensions/ql-vscode/src/databases.ts

@@ -24,13 +24,13 @@ import { Logger, logger } from './logging';
  * The name of the key in the workspaceState dictionary in which we
  * persist the current database across sessions.
  */
-const CURRENT_DB: string = 'currentDatabase';
+const CURRENT_DB = 'currentDatabase';
 
 /**
  * The name of the key in the workspaceState dictionary in which we
  * persist the list of databases across sessions.
  */
-const DB_LIST: string = 'databaseList';
+const DB_LIST = 'databaseList';
 
 export interface DatabaseOptions {
   displayName?: string;
@@ -107,8 +107,8 @@ async function findDataset(parentDirectory: string): Promise<vscode.Uri> {
   return vscode.Uri.file(dbAbsolutePath);
 }
 
-async function findSourceArchive(databasePath: string, silent: boolean = false):
-  Promise<vscode.Uri | undefined> {
+async function findSourceArchive(databasePath: string, silent = false):
+Promise<vscode.Uri | undefined> {
 
   const relativePaths = ['src', 'output/src_archive']
 
@@ -128,8 +128,9 @@ async function findSourceArchive(databasePath: string, silent: boolean = false):
   return undefined;
 }
 
-async function resolveDatabase(databasePath: string):
-  Promise<DatabaseContents | undefined> {
+async function resolveDatabase(
+  databasePath: string
+): Promise<DatabaseContents | undefined> {
 
   const name = path.basename(databasePath);
 
@@ -427,7 +428,7 @@ class DatabaseItemImpl implements DatabaseItem {
  * `event` fires. If waiting for the event takes too long (by default
  * >1000ms) log a warning, and resolve to undefined.
  */
-function eventFired<T>(event: vscode.Event<T>, timeoutMs: number = 1000): Promise<T | undefined> {
+function eventFired<T>(event: vscode.Event<T>, timeoutMs = 1000): Promise<T | undefined> {
   return new Promise((res, _rej) => {
     let timeout: NodeJS.Timeout | undefined;
     let disposable: vscode.Disposable | undefined;
@@ -436,22 +437,24 @@ function eventFired<T>(event: vscode.Event<T>, timeoutMs: number = 1000): Promis
       if (disposable !== undefined) disposable.dispose();
     }
     disposable = event(e => {
-      res(e); dispose();
+      res(e);
+      dispose();
     });
     timeout = setTimeout(() => {
       logger.log(`Waiting for event ${event} timed out after ${timeoutMs}ms`);
-      res(undefined); dispose();
+      res(undefined);
+      dispose();
     }, timeoutMs);
   });
 }
 
 export class DatabaseManager extends DisposableObject {
   private readonly _onDidChangeDatabaseItem =
-    this.push(new vscode.EventEmitter<DatabaseItem | undefined>());
+  this.push(new vscode.EventEmitter<DatabaseItem | undefined>());
   readonly onDidChangeDatabaseItem = this._onDidChangeDatabaseItem.event;
 
   private readonly _onDidChangeCurrentDatabaseItem =
-    this.push(new vscode.EventEmitter<DatabaseItem | undefined>());
+  this.push(new vscode.EventEmitter<DatabaseItem | undefined>());
   readonly onDidChangeCurrentDatabaseItem = this._onDidChangeCurrentDatabaseItem.event;
 
   private readonly _databaseItems: DatabaseItemImpl[] = [];
@@ -466,7 +469,7 @@ export class DatabaseManager extends DisposableObject {
   }
 
   public async openDatabase(uri: vscode.Uri, options?: DatabaseOptions):
-    Promise<DatabaseItem> {
+  Promise<DatabaseItem> {
 
     const contents = await resolveDatabaseContents(uri);
     const realOptions = options || {};
@@ -526,7 +529,7 @@ export class DatabaseManager extends DisposableObject {
   }
 
   private async createDatabaseItemFromPersistedState(state: PersistedDatabaseItem):
-    Promise<DatabaseItem> {
+  Promise<DatabaseItem> {
 
     let displayName: string | undefined = undefined;
     let ignoreSourceArchive = false;
@@ -584,7 +587,7 @@ export class DatabaseManager extends DisposableObject {
   }
 
   public async setCurrentDatabaseItem(item: DatabaseItem | undefined,
-    skipRefresh: boolean = false): Promise<void> {
+    skipRefresh = false): Promise<void> {
 
     if (!skipRefresh && (item !== undefined)) {
       await item.refresh();  // Will throw on invalid database.

extensions/ql-vscode/src/helpers.ts

@@ -131,7 +131,7 @@ export async function showInformationMessageWithAction(message: string, actionMe
 /** Gets all active workspace folders that are on the filesystem. */
 export function getOnDiskWorkspaceFolders() {
   const workspaceFolders = workspace.workspaceFolders || [];
-  let diskWorkspaceFolders: string[] = [];
+  const diskWorkspaceFolders: string[] = [];
   for (const workspaceFolder of workspaceFolders) {
     if (workspaceFolder.uri.scheme === "file")
       diskWorkspaceFolders.push(workspaceFolder.uri.fsPath)
@@ -215,15 +215,15 @@ export enum InvocationRateLimiterResultKind {
  * The function was invoked and returned the value `result`.
  */
 interface InvokedResult<T> {
-  kind: InvocationRateLimiterResultKind.Invoked,
-  result: T
+  kind: InvocationRateLimiterResultKind.Invoked;
+  result: T;
 }
 
 /**
  * The function was not invoked as the minimum interval since the last invocation had not elapsed.
  */
 interface RateLimitedResult {
-  kind: InvocationRateLimiterResultKind.RateLimited
+  kind: InvocationRateLimiterResultKind.RateLimited;
 }
 
 type InvocationRateLimiterResult<T> = InvokedResult<T> | RateLimitedResult;

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

@@ -18,10 +18,10 @@ export interface DatabaseInfo {
 
 /** Arbitrary query metadata */
 export interface QueryMetadata {
-  name?: string,
-  description?: string,
-  id?: string,
-  kind?: string
+  name?: string;
+  description?: string;
+  id?: string;
+  kind?: string;
 }
 
 export interface PreviousExecution {
@@ -70,18 +70,18 @@ export interface SetStateMsg {
   sortedResultsMap: SortedResultsMap;
   interpretation: undefined | Interpretation;
   database: DatabaseInfo;
-  metadata?: QueryMetadata
+  metadata?: QueryMetadata;
   /**
    * Whether to keep displaying the old results while rendering the new results.
    *
    * This is useful to prevent properties like scroll state being lost when rendering the sorted results after sorting a column.
    */
   shouldKeepOldResultsWhileRendering: boolean;
-};
+}
 
 /** Advance to the next or previous path no in the path viewer */
 export interface NavigatePathMsg {
-  t: 'navigatePath',
+  t: 'navigatePath';
 
   /** 1 for next, -1 for previous */
   direction: number;
@@ -100,20 +100,20 @@ interface ViewSourceFileMsg {
   t: 'viewSourceFile';
   loc: ResolvableLocationValue;
   databaseUri: string;
-};
+}
 
 interface ToggleDiagnostics {
   t: 'toggleDiagnostics';
   databaseUri: string;
-  metadata?: QueryMetadata
+  metadata?: QueryMetadata;
   origResultsPaths: ResultsPaths;
   visible: boolean;
   kind?: string;
-};
+}
 
 interface ResultViewLoaded {
   t: 'resultViewLoaded';
-};
+}
 
 export enum SortDirection {
   asc, desc

extensions/ql-vscode/src/interface.ts

@@ -437,9 +437,9 @@ export class InterfaceManager extends DisposableObject {
           sourceArchiveUri === undefined
             ? undefined
             : {
-                sourceArchive: sourceArchiveUri.fsPath,
-                sourceLocationPrefix
-              };
+              sourceArchive: sourceArchiveUri.fsPath,
+              sourceLocationPrefix
+            };
         interpretation = await this.getTruncatedResults(
           query.metadata,
           query.resultsPaths,
@@ -471,9 +471,9 @@ export class InterfaceManager extends DisposableObject {
       sourceArchiveUri === undefined
         ? undefined
         : {
-            sourceArchive: sourceArchiveUri.fsPath,
-            sourceLocationPrefix
-          };
+          sourceArchive: sourceArchiveUri.fsPath,
+          sourceLocationPrefix
+        };
     const interpretation = await this.getTruncatedResults(
       metadata,
       resultsInfo,

extensions/ql-vscode/src/messages.ts

@@ -216,19 +216,19 @@ export interface QlFileSet {
   /**
    * The files imported by the given file
    */
-  imports: { [key: string]: string[]; };
+  imports: { [key: string]: string[] };
   /**
    * An id of each file
    */
-  nodeNumbering: { [key: string]: number; };
+  nodeNumbering: { [key: string]: number };
   /**
    * The code for each file
    */
-  qlCode: { [key: string]: string; };
+  qlCode: { [key: string]: string };
   /**
    * The resolution of an import in each directory.
    */
-  resolvedDirImports: { [key: string]: { [key: string]: string; }; };
+  resolvedDirImports: { [key: string]: { [key: string]: string } };
 }
 
 /**
@@ -313,6 +313,7 @@ export type Severity = number;
  * Severity of different messages. This namespace is intentionally not
  * an enum, see "for the sake of extensibility" comment above.
  */
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace Severity {
   /**
    * The message is a compilation error.
@@ -360,6 +361,7 @@ export type ResultColumnKind = number;
  * The kind of a result column. This namespace is intentionally not an enum, see "for the sake of
  * extensibility" comment above.
  */
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace ResultColumnKind {
   /**
    * A column of type `float`
@@ -635,7 +637,7 @@ export interface EvaluateQueriesParams {
   useSequenceHint: boolean;
 }
 
-export type TemplateDefinitions = { [key: string]: TemplateSource; }
+export type TemplateDefinitions = { [key: string]: TemplateSource }
 
 /**
  * A single query that should be run
@@ -748,7 +750,7 @@ export interface ResultSet {
 /**
  * The type returned when the evaluation is complete
  */
-export interface EvaluationComplete { }
+export type EvaluationComplete = {};
 
 /**
  * The result of a single query
@@ -790,6 +792,7 @@ export type QueryResultType = number;
  * The result of running a query. This namespace is intentionally not
  * an enum, see "for the sake of extensibility" comment above.
  */
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace QueryResultType {
   /**
    * The query ran successfully
@@ -862,11 +865,11 @@ export interface WithProgressId<T> {
   /**
    * The main body
    */
-  body: T,
+  body: T;
   /**
    * The id used to report progress updates
    */
-  progressId: number
+  progressId: number;
 }
 
 export interface ProgressMessage {
@@ -935,7 +938,7 @@ export const runUpgrade = new rpc.RequestType<WithProgressId<RunUpgradeParams>,
  * Request returned to the client to notify completion of a query.
  * The full runQueries job is completed when all queries are acknowledged.
  */
-export const completeQuery = new rpc.RequestType<EvaluationResult, Object, void, void>('evaluation/queryCompleted');
+export const completeQuery = new rpc.RequestType<EvaluationResult, Record<string, any>, void, void>('evaluation/queryCompleted');
 
 /**
  * A notification that the progress has been changed.

extensions/ql-vscode/src/qlpack-discovery.ts

@@ -6,7 +6,7 @@ import { Discovery } from './discovery';
 export interface QLPack {
   name: string;
   uri: Uri;
-};
+}
 
 /**
  * Service to discover all available QL packs in a workspace folder.