build: Enable linting in the build

Author: aeisenberg

.github/workflows/main.yml

@@ -62,6 +62,11 @@ jobs:
           npm run build-ci
         shell: bash
 
+      - name: Lint
+        run: |
+          cd extensions/ql-vscode
+          npm run lint
+
       - name: Install CodeQL
         run: |
           mkdir codeql-home

extensions/ql-vscode/src/databases.ts

@@ -440,12 +440,8 @@ function eventFired<T>(event: vscode.Event<T>, timeoutMs = 1000): Promise<T | un
       dispose();
     });
     function dispose() {
-      if (timeout !== undefined) {
-        clearTimeout(timeout);
-      }
-      if (disposable !== undefined) {
-        disposable.dispose();
-      }
+      clearTimeout(timeout);
+      disposable.dispose();
     }
   });
 }

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

@@ -71,21 +71,22 @@ function getQuickQueriesDir(ctx: ExtensionContext): string {
 }
 
 
-function updateQuickQueryDir(queriesDir: string, index: number, len: number) {
-  workspace.updateWorkspaceFolders(
-    index,
-    len,
-    { uri: Uri.file(queriesDir), name: QUICK_QUERY_WORKSPACE_FOLDER_NAME }
-  );
-}
 
 
 /**
  * Show a buffer the user can enter a simple query into.
  */
 export async function displayQuickQuery(ctx: ExtensionContext, cliServer: CodeQLCliServer, databaseUI: DatabaseUI) {
-  try {
 
+  function updateQuickQueryDir(queriesDir: string, index: number, len: number) {
+    workspace.updateWorkspaceFolders(
+      index,
+      len,
+      { uri: Uri.file(queriesDir), name: QUICK_QUERY_WORKSPACE_FOLDER_NAME }
+    );
+  }
+
+  try {
     const workspaceFolders = workspace.workspaceFolders || [];
     const queriesDir = await getQuickQueriesDir(ctx);