Merge comments and mock command

Author: norascheuch

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

@@ -12,7 +12,7 @@ import type {
   VariantAnalysisScannedRepositoryResult,
 } from "../variant-analysis/shared/variant-analysis";
 import type { QLDebugConfiguration } from "../debugger/debug-configuration";
-import { QueryTreeViewItem } from "../queries-panel/query-tree-view-item";
+import type { QueryTreeViewItem } from "../queries-panel/query-tree-view-item";
 
 // A command function matching the signature that VS Code calls when
 // a command is invoked from a context menu on a TreeView with

extensions/ql-vscode/src/queries-panel/queries-module.ts

@@ -27,8 +27,10 @@ export class QueriesModule extends DisposableObject {
   }
 
   public getCommands(): QueriesPanelCommands {
-    if (!this.shouldInitializeQueriesPanel) {
-      return {} as any as QueriesPanelCommands;
+    if (!this.shouldInitializeQueriesPanel()) {
+      return {
+        "codeQLQueries.runLocalQueryContextInline": () => Promise.resolve(),
+      };
     }
 
     if (!this.queriesPanel) {

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

@@ -1,10 +1,10 @@
-import * as vscode from "vscode";
 import { DisposableObject } from "../common/disposable-object";
 import { QueryTreeDataProvider } from "./query-tree-data-provider";
 import { QueryDiscovery } from "./query-discovery";
 import { QueriesPanelCommands } from "../common/commands";
 import { QueryTreeViewItem } from "./query-tree-view-item";
 import { App } from "../common/app";
+import { Uri, window } from "vscode";
 
 export class QueriesPanel extends DisposableObject {
   public constructor(
@@ -15,7 +15,7 @@ export class QueriesPanel extends DisposableObject {
 
     const dataProvider = new QueryTreeDataProvider(queryDiscovery);
 
-    const treeView = vscode.window.createTreeView("codeQLQueries", {
+    const treeView = window.createTreeView("codeQLQueries", {
       treeDataProvider: dataProvider,
     });
     this.push(treeView);
@@ -32,7 +32,7 @@ export class QueriesPanel extends DisposableObject {
   ): Promise<void> {
     await this.app.queryServerCommands.execute(
       "codeQLQueries.runLocalQueryFromQueriesPanel",
-      vscode.Uri.file(queryTreeViewItem.path),
+      Uri.file(queryTreeViewItem.path),
     );
   }
 }