Merge pull request #2393 from github/aeisenberg/fix-cfg-viewer

Fix CFG viewer

Author: aeisenberg

extensions/ql-vscode/src/language-support/ast-viewer/ast-cfg-commands.ts

@@ -52,6 +52,8 @@ export function getAstCfgCommands({
             progress,
             token,
             undefined,
+            undefined,
+            res[1],
           );
         }
       },

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

@@ -337,6 +337,7 @@ export class LocalQueries extends DisposableObject {
     token: CancellationToken,
     databaseItem: DatabaseItem | undefined,
     range?: Range,
+    templates?: Record<string, string>,
   ): Promise<void> {
     await this.compileAndRunQueryInternal(
       quickEval,
@@ -345,6 +346,7 @@ export class LocalQueries extends DisposableObject {
       token,
       databaseItem,
       range,
+      templates,
     );
   }
 
@@ -356,6 +358,7 @@ export class LocalQueries extends DisposableObject {
     token: CancellationToken,
     databaseItem: DatabaseItem | undefined,
     range?: Range,
+    templates?: Record<string, string>,
   ): Promise<CoreCompletedQuery> {
     let queryPath: string;
     if (queryUri !== undefined) {
@@ -395,7 +398,7 @@ export class LocalQueries extends DisposableObject {
       extensionPacks,
       this.queryStorageDir,
       undefined,
-      undefined,
+      templates,
     );
 
     // handle cancellation from the history view.