Merge branch 'main' into elena/yer-a-flag-query

Author: elenatanasoiu

extensions/ql-vscode/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Added ability to filter repositories for a variant analysis to only those that have results [#2343](https://github.com/github/vscode-codeql/pull/2343)
 - Add new configuration option to allow downloading databases from http, non-secure servers. [#2332](https://github.com/github/vscode-codeql/pull/2332)
+- Remove title actions from the query history panel that depended on history items being selected. [#2350](https://github.com/github/vscode-codeql/pull/2350)
 
 ## 1.8.2 - 12 April 2023
 

extensions/ql-vscode/package.json

@@ -633,11 +633,6 @@
         "command": "codeQL.checkForUpdatesToCLI",
         "title": "CodeQL: Check for CLI Updates"
       },
-      {
-        "command": "codeQLQueryHistory.openQueryTitleMenu",
-        "title": "View Query",
-        "icon": "$(edit)"
-      },
       {
         "command": "codeQLQueryHistory.openQueryContextMenu",
         "title": "View Query",
@@ -648,11 +643,6 @@
         "title": "Open Query Results",
         "icon": "$(preview)"
       },
-      {
-        "command": "codeQLQueryHistory.removeHistoryItemTitleMenu",
-        "title": "Delete",
-        "icon": "$(trash)"
-      },
       {
         "command": "codeQLQueryHistory.removeHistoryItemContextMenu",
         "title": "Delete",
@@ -853,21 +843,6 @@
           "when": "view == codeQLDatabases",
           "group": "navigation"
         },
-        {
-          "command": "codeQLQueryHistory.openQueryTitleMenu",
-          "when": "view == codeQLQueryHistory",
-          "group": "navigation"
-        },
-        {
-          "command": "codeQLQueryHistory.itemClicked",
-          "when": "view == codeQLQueryHistory",
-          "group": "navigation"
-        },
-        {
-          "command": "codeQLQueryHistory.removeHistoryItemTitleMenu",
-          "when": "view == codeQLQueryHistory",
-          "group": "navigation"
-        },
         {
           "command": "codeQLQueryHistory.sortByName",
           "when": "view == codeQLQueryHistory",
@@ -1310,18 +1285,10 @@
           "command": "codeQLDatabases.upgradeDatabase",
           "when": "false"
         },
-        {
-          "command": "codeQLQueryHistory.openQueryTitleMenu",
-          "when": "false"
-        },
         {
           "command": "codeQLQueryHistory.openQueryContextMenu",
           "when": "false"
         },
-        {
-          "command": "codeQLQueryHistory.removeHistoryItemTitleMenu",
-          "when": "false"
-        },
         {
           "command": "codeQLQueryHistory.removeHistoryItemContextMenu",
           "when": "false"

extensions/ql-vscode/src/ast-cfg-commands.ts

@@ -6,7 +6,7 @@ import {
   TemplatePrintCfgProvider,
 } from "./contextual/templateProvider";
 import { AstCfgCommands } from "./common/commands";
-import { LocalQueries } from "./local-queries";
+import { LocalQueries } from "./local-queries/local-queries";
 
 type AstCfgOptions = {
   localQueries: LocalQueries;

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

@@ -13,21 +13,6 @@ import type {
 } from "../variant-analysis/shared/variant-analysis";
 import type { QLDebugConfiguration } from "../debugger/debug-configuration";
 
-// A command function matching the signature that VS Code calls when
-// a command is invoked from the title bar of a TreeView with
-// canSelectMany set to true.
-//
-// It is possible to get any combination of singleItem and multiSelect
-// to be undefined. This is because it is possible to click a title bar
-// option without interacting with any individual items first, or even
-// when there are no items present at all.
-// If both singleItem and multiSelect are defined, then singleItem will
-// be contained within multiSelect.
-export type TreeViewTitleMultiSelectionCommandFunction<Item> = (
-  singleItem: Item | undefined,
-  multiSelect: Item[] | undefined,
-) => Promise<void>;
-
 // A command function matching the signature that VS Code calls when
 // a command is invoked from a context menu on a TreeView with
 // canSelectMany set to true.
@@ -176,9 +161,7 @@ export type QueryHistoryCommands = {
   "codeQLQueryHistory.sortByCount": () => Promise<void>;
 
   // Commands in the context menu or in the hover menu
-  "codeQLQueryHistory.openQueryTitleMenu": TreeViewTitleMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.openQueryContextMenu": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
-  "codeQLQueryHistory.removeHistoryItemTitleMenu": TreeViewTitleMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.removeHistoryItemContextMenu": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.removeHistoryItemContextInline": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.renameItem": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
@@ -195,7 +178,7 @@ export type QueryHistoryCommands = {
   "codeQLQueryHistory.viewCsvAlerts": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.viewSarifAlerts": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.viewDil": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
-  "codeQLQueryHistory.itemClicked": TreeViewTitleMultiSelectionCommandFunction<QueryHistoryInfo>;
+  "codeQLQueryHistory.itemClicked": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.openOnGithub": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
   "codeQLQueryHistory.copyRepoList": TreeViewContextMultiSelectionCommandFunction<QueryHistoryInfo>;
 

extensions/ql-vscode/src/debugger/debug-configuration.ts

@@ -5,7 +5,7 @@ import {
   WorkspaceFolder,
 } from "vscode";
 import { getOnDiskWorkspaceFolders, showAndLogErrorMessage } from "../helpers";
-import { LocalQueries } from "../local-queries";
+import { LocalQueries } from "../local-queries/local-queries";
 import { getQuickEvalContext, validateQueryPath } from "../run-queries-shared";
 import * as CodeQLProtocol from "./debug-protocol";
 import { getErrorMessage } from "../pure/helpers-pure";

extensions/ql-vscode/src/debugger/debugger-factory.ts

@@ -9,7 +9,7 @@ import {
   ProviderResult,
 } from "vscode";
 import { isCanary } from "../config";
-import { LocalQueries } from "../local-queries";
+import { LocalQueries } from "../local-queries/local-queries";
 import { DisposableObject } from "../pure/disposable-object";
 import { QueryRunner } from "../queryRunner";
 import { QLDebugConfigurationProvider } from "./debug-configuration";

extensions/ql-vscode/src/debugger/debugger-ui.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import { DebuggerCommands } from "../common/commands";
 import { DatabaseManager } from "../local-databases";
-import { LocalQueries, LocalQueryRun } from "../local-queries";
+import { LocalQueries } from "../local-queries/local-queries";
 import { DisposableObject } from "../pure/disposable-object";
 import { CoreQueryResults } from "../queryRunner";
 import {
@@ -20,6 +20,7 @@ import {
 import { QLResolvedDebugConfiguration } from "./debug-configuration";
 import * as CodeQLProtocol from "./debug-protocol";
 import { App } from "../common/app";
+import { LocalQueryRun } from "../local-queries/local-query-run";
 
 /**
  * Listens to messages passing between VS Code and the debug adapter, so that we can supplement the

extensions/ql-vscode/src/extension.ts

@@ -117,7 +117,7 @@ import {
   PreActivationCommands,
   QueryServerCommands,
 } from "./common/commands";
-import { LocalQueries } from "./local-queries";
+import { LocalQueries } from "./local-queries/local-queries";
 import { getAstCfgCommands } from "./ast-cfg-commands";
 import { getQueryEditorCommands } from "./query-editor";
 import { App } from "./common/app";