Merge pull request #2544 from github/nora/queries-panel-file-tab

Queries Panel: run local query from file tab
github · Jun 26, 2023 · 75d2f76 · 75d2f76
2 parents 75cffd5 + 10d8bbf
commit 75d2f76
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
@@ -503,7 +503,11 @@
       },
       {
         "command": "codeQLQueries.runLocalQueryFromQueriesPanel",
-        "title": "Run local query",
+        "title": "Run local query"
+      },
+      {
+        "command": "codeQL.runLocalQueryFromFileTab",
+        "title": "CodeQL: Run local query",
         "icon": "$(run)"
       },
       {
@@ -877,6 +881,13 @@
       }
     ],
     "menus": {
+      "editor/title": [
+        {
+          "command": "codeQL.runLocalQueryFromFileTab",
+          "group": "navigation",
+          "when": "config.codeQL.queriesPanel && resourceExtname == .ql && codeQL.currentDatabaseItem"
+        }
+      ],
       "view/title": [
         {
           "command": "codeQLDatabases.sortByName",
@@ -1168,6 +1179,10 @@
           "command": "codeQLQueries.runLocalQueryFromQueriesPanel",
           "when": "false"
         },
+        {
+          "command": "codeQL.runLocalQueryFromFileTab",
+          "when": "false"
+        },
         {
           "command": "codeQL.runQueryContextEditor",
           "when": "false"

diff --git a/extensions/ql-vscode/src/common/commands.ts b/extensions/ql-vscode/src/common/commands.ts
@@ -131,6 +131,7 @@ export type LocalQueryCommands = {
     uri?: Uri,
   ) => Promise<void>;
   "codeQLQueries.runLocalQueryFromQueriesPanel": TreeViewContextSingleSelectionCommandFunction<QueryTreeViewItem>;
+  "codeQL.runLocalQueryFromFileTab": (uri: Uri) => Promise<void>;
   "codeQL.runQueries": ExplorerSelectionCommandFunction<Uri>;
   "codeQL.quickEval": (uri: Uri) => Promise<void>;
   "codeQL.quickEvalContextEditor": (uri: Uri) => Promise<void>;

diff --git a/extensions/ql-vscode/src/local-queries/local-queries.ts b/extensions/ql-vscode/src/local-queries/local-queries.ts
@@ -103,6 +103,7 @@ export class LocalQueries extends DisposableObject {
         this.runQueryOnMultipleDatabases.bind(this),
       "codeQLQueries.runLocalQueryFromQueriesPanel":
         this.runQueryFromQueriesPanel.bind(this),
+      "codeQL.runLocalQueryFromFileTab": this.runQuery.bind(this),
       "codeQL.runQueries": createMultiSelectionCommand(
         this.runQueries.bind(this),
       ),

diff --git a/extensions/ql-vscode/test/unit-tests/command-lint.test.ts b/extensions/ql-vscode/test/unit-tests/command-lint.test.ts
@@ -66,6 +66,12 @@ describe("commands declared in package.json", () => {
     contribContextMenuCmds.add(command);
   });
 
+  menus["editor/title"].forEach((commandDecl: CmdDecl) => {
+    const { command } = commandDecl;
+    paletteCmds.delete(command);
+    contribContextMenuCmds.add(command);
+  });
+
   debuggers.forEach((debuggerDecl: DebuggerDecl) => {
     if (debuggerDecl.variables !== undefined) {
       for (const command of Object.values(debuggerDecl.variables)) {