Merge branch 'main' into robertbrignull/useScrollIntoView

Author: robertbrignull

.github/workflows/cli-test.yml

@@ -6,9 +6,11 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
+      - .github/workflows/cli-test.yml
       - extensions/ql-vscode/src/codeql-cli/**
       - extensions/ql-vscode/src/language-support/**
       - extensions/ql-vscode/src/query-server/**
+      - extensions/ql-vscode/supported_cli_versions.json
 
 jobs:
   find-nightly:
@@ -47,7 +49,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        version: ${{ fromJson(needs.set-matrix.outputs.cli-versions) }} 
+        version: ${{ fromJson(needs.set-matrix.outputs.cli-versions) }}
       fail-fast: false
     env:
       CLI_VERSION: ${{ matrix.version }}

CODEOWNERS

@@ -1,5 +1,5 @@
 **/* @github/codeql-vscode-reviewers
 **/variant-analysis/ @github/code-scanning-secexp-reviewers
 **/databases/ @github/code-scanning-secexp-reviewers
-**/data-extensions-editor/ @github/code-scanning-secexp-reviewers
+**/model-editor/ @github/code-scanning-secexp-reviewers
 **/queries-panel/ @github/code-scanning-secexp-reviewers

extensions/ql-vscode/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [UNRELEASED]
 
+- Update how variant analysis results are displayed. For queries with ["path-problem" or "problem" `@kind`](https://codeql.github.com/docs/writing-codeql-queries/metadata-for-codeql-queries/#metadata-properties), you can choose to display the results as rendered alerts or as a table of raw results. For queries with any other `@kind`, the results are displayed as a table. [#2745](https://github.com/github/vscode-codeql/pull/2745) & [#2749](https://github.com/github/vscode-codeql/pull/2749)
 - When running variant analyses, don't download artifacts for repositories with no results. [#2736](https://github.com/github/vscode-codeql/pull/2736)
 - Group the extension settings, so that they're easier to find in the Settings UI. [#2706](https://github.com/github/vscode-codeql/pull/2706)
 

extensions/ql-vscode/package.json

@@ -943,8 +943,8 @@
         "enablement": "codeql.hasQLSource"
       },
       {
-        "command": "codeQL.openDataExtensionsEditor",
-        "title": "CodeQL: Open Data Extensions Editor"
+        "command": "codeQL.openModelEditor",
+        "title": "CodeQL: Open CodeQL Model Editor"
       },
       {
         "command": "codeQL.mockGitHubApiServer.startRecording",
@@ -1415,7 +1415,7 @@
           "when": "false"
         },
         {
-          "command": "codeQL.openDataExtensionsEditor",
+          "command": "codeQL.openModelEditor",
           "when": "config.codeQL.canary && config.codeQL.dataExtensions.editor"
         },
         {
@@ -1652,7 +1652,7 @@
         },
         {
           "command": "codeQL.createQuery",
-          "when": "config.codeQL.codespacesTemplate"
+          "when": "config.codeQL.codespacesTemplate || config.codeQL.canary && config.codeQL.queriesPanel"
         },
         {
           "command": "codeQLTests.acceptOutputContextTestItem",
@@ -1724,8 +1724,8 @@
       ],
       "panel": [
         {
-          "id": "codeql-model-details",
-          "title": "CodeQL Model Details",
+          "id": "codeql-methods-usage",
+          "title": "CodeQL Methods Usage",
           "icon": "media/logo.svg"
         }
       ]
@@ -1759,17 +1759,25 @@
           "when": "config.codeQL.canary"
         }
       ],
-      "codeql-model-details": [
+      "codeql-methods-usage": [
         {
-          "id": "codeQLModelDetails",
-          "name": "CodeQL Model Details",
-          "when": "config.codeQL.canary && codeql.dataExtensionsEditorOpen"
+          "id": "codeQLMethodsUsage",
+          "name": "CodeQL Methods Usage",
+          "when": "config.codeQL.canary && codeql.modelEditorOpen"
+        }
+      ],
+      "explorer": [
+        {
+          "type": "webview",
+          "id": "codeQLMethodModeling",
+          "name": "CodeQL Method Modeling",
+          "when": "config.codeQL.canary && config.codeQL.modelEditor.methodModelingView && codeql.modelEditorOpen"
         }
       ]
     },
     "viewsWelcome": [
       {
-        "view": "codeQLModelDetails",
+        "view": "codeQLMethodsUsage",
         "contents": "Loading..."
       },
       {

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

@@ -12,7 +12,7 @@ import type {
 } from "../variant-analysis/shared/variant-analysis";
 import type { QLDebugConfiguration } from "../debugger/debug-configuration";
 import type { QueryTreeViewItem } from "../queries-panel/query-tree-view-item";
-import type { Usage } from "../data-extensions-editor/external-api-usage";
+import type { Usage } from "../model-editor/external-api-usage";
 
 // A command function matching the signature that VS Code calls when
 // a command is invoked from a context menu on a TreeView with
@@ -302,9 +302,9 @@ export type PackagingCommands = {
   "codeQL.downloadPacks": () => Promise<void>;
 };
 
-export type DataExtensionsEditorCommands = {
-  "codeQL.openDataExtensionsEditor": () => Promise<void>;
-  "codeQLDataExtensionsEditor.jumpToUsageLocation": (
+export type ModelEditorCommands = {
+  "codeQL.openModelEditor": () => Promise<void>;
+  "codeQLModelEditor.jumpToUsageLocation": (
     usage: Usage,
     databaseItem: DatabaseItem,
   ) => Promise<void>;
@@ -347,7 +347,7 @@ export type AllExtensionCommands = BaseCommands &
   AstCfgCommands &
   AstViewerCommands &
   PackagingCommands &
-  DataExtensionsEditorCommands &
+  ModelEditorCommands &
   EvalLogViewerCommands &
   SummaryLanguageSupportCommands &
   Partial<TestUICommands> &

extensions/ql-vscode/src/common/interface-types.ts

@@ -17,13 +17,10 @@ import {
 } from "../variant-analysis/shared/variant-analysis-filter-sort";
 import { ErrorLike } from "../common/errors";
 import { DataFlowPaths } from "../variant-analysis/shared/data-flow-paths";
-import {
-  ExternalApiUsage,
-  Usage,
-} from "../data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../data-extensions-editor/modeled-method";
-import { DataExtensionEditorViewState } from "../data-extensions-editor/shared/view-state";
-import { Mode } from "../data-extensions-editor/shared/mode";
+import { ExternalApiUsage, Usage } from "../model-editor/external-api-usage";
+import { ModeledMethod } from "../model-editor/modeled-method";
+import { ModelEditorViewState } from "../model-editor/shared/view-state";
+import { Mode } from "../model-editor/shared/mode";
 
 /**
  * This module contains types and code that are shared between
@@ -494,8 +491,8 @@ export type ToDataFlowPathsMessage = SetDataFlowPathsMessage;
 export type FromDataFlowPathsMessage = CommonFromViewMessages;
 
 interface SetExtensionPackStateMessage {
-  t: "setDataExtensionEditorViewState";
-  viewState: DataExtensionEditorViewState;
+  t: "setModelEditorViewState";
+  viewState: ModelEditorViewState;
 }
 
 interface SetExternalApiUsagesMessage {
@@ -572,14 +569,14 @@ interface HideModeledApisMessage {
   hideModeledApis: boolean;
 }
 
-export type ToDataExtensionsEditorMessage =
+export type ToModelEditorMessage =
   | SetExtensionPackStateMessage
   | SetExternalApiUsagesMessage
   | LoadModeledMethodsMessage
   | AddModeledMethodsMessage
   | SetInProgressMethodsMessage;
 
-export type FromDataExtensionsEditorMessage =
+export type FromModelEditorMessage =
   | ViewLoadedMsg
   | SwitchModeMessage
   | RefreshExternalApiUsages
@@ -592,3 +589,7 @@ export type FromDataExtensionsEditorMessage =
   | StopGeneratingExternalApiFromLlmMessage
   | ModelDependencyMessage
   | HideModeledApisMessage;
+
+export type FromMethodModelingMessage =
+  | TelemetryMessage
+  | UnhandledErrorMessage;

extensions/ql-vscode/src/common/vscode/abstract-webview.ts

@@ -11,13 +11,13 @@ import { join } from "path";
 
 import { DisposableObject, DisposeHandler } from "../disposable-object";
 import { tmpDir } from "../../tmp-dir";
-import { getHtmlForWebview, WebviewMessage, WebviewView } from "./webview-html";
+import { getHtmlForWebview, WebviewMessage, WebviewKind } from "./webview-html";
 
 export type WebviewPanelConfig = {
   viewId: string;
   title: string;
   viewColumn: ViewColumn;
-  view: WebviewView;
+  view: WebviewKind;
   preserveFocus?: boolean;
   iconPath?: Uri | { dark: Uri; light: Uri };
   additionalOptions?: WebviewPanelOptions & WebviewOptions;

extensions/ql-vscode/src/common/vscode/webview-html.ts

@@ -2,12 +2,13 @@ import { ExtensionContext, Uri, Webview } from "vscode";
 import { randomBytes } from "crypto";
 import { EOL } from "os";
 
-export type WebviewView =
+export type WebviewKind =
   | "results"
   | "compare"
   | "variant-analysis"
   | "data-flow-paths"
-  | "data-extensions-editor";
+  | "model-editor"
+  | "method-modeling";
 
 export interface WebviewMessage {
   t: string;
@@ -20,7 +21,7 @@ export interface WebviewMessage {
 export function getHtmlForWebview(
   ctx: ExtensionContext,
   webview: Webview,
-  view: WebviewView,
+  view: WebviewKind,
   {
     allowInlineStyles,
     allowWasmEval,

extensions/ql-vscode/src/config.ts

@@ -704,7 +704,6 @@ export function showQueriesPanel(): boolean {
 
 const DATA_EXTENSIONS = new Setting("dataExtensions", ROOT_SETTING);
 const LLM_GENERATION = new Setting("llmGeneration", DATA_EXTENSIONS);
-const FRAMEWORK_MODE = new Setting("frameworkMode", DATA_EXTENSIONS);
 const DISABLE_AUTO_NAME_EXTENSION_PACK = new Setting(
   "disableAutoNameExtensionPack",
   DATA_EXTENSIONS,
@@ -718,10 +717,6 @@ export function showLlmGeneration(): boolean {
   return !!LLM_GENERATION.getValue<boolean>();
 }
 
-export function enableFrameworkMode(): boolean {
-  return !!FRAMEWORK_MODE.getValue<boolean>();
-}
-
 export function disableAutoNameExtensionPack(): boolean {
   return !!DISABLE_AUTO_NAME_EXTENSION_PACK.getValue<boolean>();
 }

extensions/ql-vscode/src/extension.ts

@@ -128,7 +128,7 @@ import { getAstCfgCommands } from "./language-support/ast-viewer/ast-cfg-command
 import { App } from "./common/app";
 import { registerCommandWithErrorHandling } from "./common/vscode/commands";
 import { DebuggerUI } from "./debugger/debugger-ui";
-import { DataExtensionsEditorModule } from "./data-extensions-editor/data-extensions-editor-module";
+import { ModelEditorModule } from "./model-editor/model-editor-module";
 import { TestManager } from "./query-testing/test-manager";
 import { TestRunner } from "./query-testing/test-runner";
 import { TestManagerBase } from "./query-testing/test-manager-base";
@@ -934,15 +934,14 @@ async function activateWithInstalledDistribution(
   const debuggerUI = new DebuggerUI(app, localQueries, dbm);
   ctx.subscriptions.push(debuggerUI);
 
-  const dataExtensionsEditorModule =
-    await DataExtensionsEditorModule.initialize(
-      ctx,
-      app,
-      dbm,
-      cliServer,
-      qs,
-      tmpDir.name,
-    );
+  const modelEditorModule = await ModelEditorModule.initialize(
+    ctx,
+    app,
+    dbm,
+    cliServer,
+    qs,
+    tmpDir.name,
+  );
 
   void extLogger.log("Initializing QLTest interface.");
 
@@ -1015,7 +1014,7 @@ async function activateWithInstalledDistribution(
     ...getPackagingCommands({
       cliServer,
     }),
-    ...dataExtensionsEditorModule.getCommands(),
+    ...modelEditorModule.getCommands(),
     ...evalLogViewer.getCommands(),
     ...summaryLanguageSupport.getCommands(),
     ...testUiCommands,