lint: Fix linting and update linting rules

extensions/ql-vscode/.eslintrc.js

@@ -6,6 +6,7 @@ module.exports = {
     ecmaFeatures: {
       modules: true,
     },
+    project: ['tsconfig.json', './src/**/tsconfig.json'],
   },
   plugins: ['@typescript-eslint'],
   env: {

extensions/ql-vscode/src/logging.ts

@@ -25,7 +25,7 @@ export interface Logger {
    * Remove the log at the specified location
    * @param location log to remove
    */
-  removeAdditionalLogLocation(location: string): Promise<void>;
+  removeAdditionalLogLocation(location: string): void;
 }
 
 export type ProgressReporter = Progress<{ message: string }>;
@@ -88,7 +88,7 @@ export class OutputChannelLogger extends DisposableObject implements Logger {
     this.outputChannel.show(preserveFocus);
   }
 
-  async removeAdditionalLogLocation(location: string): Promise<void> {
+  removeAdditionalLogLocation(location: string): void {
     if (this.additionalLogLocationPath) {
       const logPath = path.join(this.additionalLogLocationPath, location);
       const additional = this.additionalLocations.get(logPath);

extensions/ql-vscode/src/queryserver-client.ts

@@ -92,7 +92,7 @@ export class QueryServerClient extends DisposableObject {
     await this.startQueryServer();
   }
 
-  async showLog(): Promise<void> {
+  showLog(): void {
     this.logger.show();
   }
 

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

@@ -20,7 +20,7 @@ export function isQuickQueryPath(queryPath: string): boolean {
 
 async function getQlPackFor(cliServer: CodeQLCliServer, dbschemePath: string): Promise<string> {
   const qlpacks = await cliServer.resolveQlpacks(helpers.getOnDiskWorkspaceFolders());
-  const packs: { packDir: string | undefined, packName: string }[] =
+  const packs: { packDir: string | undefined; packName: string }[] =
     Object.entries(qlpacks).map(([packName, dirs]) => {
       if (dirs.length < 1) {
         logger.log(`In getQlPackFor ${dbschemePath}, qlpack ${packName} has no directories`);
@@ -60,7 +60,7 @@ function getBaseText(dbschemeBase: string) {
   return 'select ""';
 }
 
-async function getQuickQueriesDir(ctx: ExtensionContext): Promise<string> {
+function getQuickQueriesDir(ctx: ExtensionContext): string {
   const storagePath = ctx.storagePath;
   if (storagePath === undefined) {
     throw new Error('Workspace storage path is undefined');

extensions/ql-vscode/src/upgrades.ts

@@ -19,8 +19,9 @@ const MAX_UPGRADE_MESSAGE_LINES = 10;
  * Reports errors to both the user and the console.
  * @returns the `UpgradeParams` needed to start the upgrade, if the upgrade is possible and was confirmed by the user, or `undefined` otherwise.
  */
-async function checkAndConfirmDatabaseUpgrade(qs: qsClient.QueryServerClient, db: DatabaseItem, targetDbScheme: vscode.Uri, upgradesDirectories: vscode.Uri[]):
-  Promise<messages.UpgradeParams | undefined> {
+async function checkAndConfirmDatabaseUpgrade(
+  qs: qsClient.QueryServerClient, db: DatabaseItem, targetDbScheme: vscode.Uri, upgradesDirectories: vscode.Uri[]
+): Promise<messages.UpgradeParams | undefined> {
   if (db.contents === undefined || db.contents.dbSchemeUri === undefined) {
     helpers.showAndLogErrorMessage("Database is invalid, and cannot be upgraded.");
     return;
@@ -80,7 +81,7 @@ async function checkAndConfirmDatabaseUpgrade(qs: qsClient.QueryServerClient, db
   const showLogItem: vscode.MessageItem = { title: 'No, Show Changes', isCloseAffordance: true };
   const yesItem = { title: 'Yes', isCloseAffordance: false };
   const noItem = { title: 'No', isCloseAffordance: true }
-  let dialogOptions: vscode.MessageItem[] = [yesItem, noItem];
+  const dialogOptions: vscode.MessageItem[] = [yesItem, noItem];
 
   let messageLines = descriptionMessage.split('\n');
   if (messageLines.length > MAX_UPGRADE_MESSAGE_LINES) {
@@ -110,8 +111,9 @@ async function checkAndConfirmDatabaseUpgrade(qs: qsClient.QueryServerClient, db
  * First performs a dry-run and prompts the user to confirm the upgrade.
  * Reports errors during compilation and evaluation of upgrades to the user.
  */
-export async function upgradeDatabase(qs: qsClient.QueryServerClient, db: DatabaseItem, targetDbScheme: vscode.Uri, upgradesDirectories: vscode.Uri[]):
-  Promise<messages.RunUpgradeResult | undefined> {
+export async function upgradeDatabase(
+  qs: qsClient.QueryServerClient, db: DatabaseItem, targetDbScheme: vscode.Uri, upgradesDirectories: vscode.Uri[]
+): Promise<messages.RunUpgradeResult | undefined> {
   const upgradeParams = await checkAndConfirmDatabaseUpgrade(qs, db, targetDbScheme, upgradesDirectories);
 
   if (upgradeParams === undefined) {
@@ -150,8 +152,9 @@ export async function upgradeDatabase(qs: qsClient.QueryServerClient, db: Databa
   }
 }
 
-async function checkDatabaseUpgrade(qs: qsClient.QueryServerClient, upgradeParams: messages.UpgradeParams):
-  Promise<messages.CheckUpgradeResult> {
+async function checkDatabaseUpgrade(
+  qs: qsClient.QueryServerClient, upgradeParams: messages.UpgradeParams
+): Promise<messages.CheckUpgradeResult> {
   return helpers.withProgress({
     location: vscode.ProgressLocation.Notification,
     title: "Checking for database upgrades",
@@ -159,8 +162,9 @@ async function checkDatabaseUpgrade(qs: qsClient.QueryServerClient, upgradeParam
   }, (progress, token) => qs.sendRequest(messages.checkUpgrade, upgradeParams, token, progress));
 }
 
-async function compileDatabaseUpgrade(qs: qsClient.QueryServerClient, upgradeParams: messages.UpgradeParams):
-  Promise<messages.CompileUpgradeResult> {
+async function compileDatabaseUpgrade(
+  qs: qsClient.QueryServerClient, upgradeParams: messages.UpgradeParams
+): Promise<messages.CompileUpgradeResult> {
   const params: messages.CompileUpgradeParams = {
     upgrade: upgradeParams,
     upgradeTempDir: upgradesTmpDir.name
@@ -173,8 +177,9 @@ async function compileDatabaseUpgrade(qs: qsClient.QueryServerClient, upgradePar
   }, (progress, token) => qs.sendRequest(messages.compileUpgrade, params, token, progress));
 }
 
-async function runDatabaseUpgrade(qs: qsClient.QueryServerClient, db: DatabaseItem, upgrades: messages.CompiledUpgrades):
-  Promise<messages.RunUpgradeResult> {
+async function runDatabaseUpgrade(
+  qs: qsClient.QueryServerClient, db: DatabaseItem, upgrades: messages.CompiledUpgrades
+): Promise<messages.RunUpgradeResult> {
 
   if (db.contents === undefined || db.contents.datasetUri === undefined) {
     throw new Error('Can\'t upgrade an invalid database.');

extensions/ql-vscode/src/view/.eslintrc.js

@@ -4,5 +4,5 @@ module.exports = {
   },
   env: {
     browser: true
-  },
+  }
 }

extensions/ql-vscode/test/.eslintrc.js

@@ -1,5 +1,8 @@
 module.exports = {
   env: {
     mocha: true
-  }
+  },
+  parserOptions: {
+    project: 'tsconfig.json',
+  },
 }

extensions/ql-vscode/test/pure-tests/query-test.ts

@@ -41,11 +41,11 @@ class Checkpoint<T> {
   }
 
   async resolve(): Promise<void> {
-    (this.res)();
+    await (this.res)();
   }
 
   async reject(e: Error): Promise<void> {
-    (this.rej)(e);
+    await (this.rej)(e);
   }
 }
 

tsconfig.json

@@ -0,0 +1 @@
+{}