Merge pull request #2788 from github/v1.8.11

v1.8.11

.github/workflows/cli-test.yml

@@ -0,0 +1,111 @@
+name: Run CLI tests
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+  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:
+    name: Find Nightly Release
+    runs-on: ubuntu-latest
+    outputs:
+      url: ${{ steps.get-url.outputs.nightly-url }}
+    steps:
+      - name: Get Nightly Release URL
+        id: get-url
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        shell: bash
+        # This workflow step gets an unstable testing version of the CodeQL CLI. It should not be used outside of these tests.
+        run: |
+          LATEST=`gh api repos/dsp-testing/codeql-cli-nightlies/releases --jq '.[].tag_name' --method GET --raw-field 'per_page=1'`
+          echo "nightly-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/$LATEST" >> "$GITHUB_OUTPUT"
+
+  set-matrix:
+    name: Set Matrix for cli-test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set the variables
+        id: set-variables
+        run: echo "cli-versions=$(cat ./extensions/ql-vscode/supported_cli_versions.json | jq -rc)" >> $GITHUB_OUTPUT
+    outputs:
+      cli-versions: ${{ steps.set-variables.outputs.cli-versions }}
+
+  cli-test:
+    name: CLI Test
+    runs-on: ${{ matrix.os }}
+    needs: [find-nightly, set-matrix]
+    timeout-minutes: 30
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        version: ${{ fromJson(needs.set-matrix.outputs.cli-versions) }}
+      fail-fast: false
+    env:
+      CLI_VERSION: ${{ matrix.version }}
+      NIGHTLY_URL: ${{ needs.find-nightly.outputs.url }}
+      TEST_CODEQL_PATH: '${{ github.workspace }}/codeql'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16.17.1'
+          cache: 'npm'
+          cache-dependency-path: extensions/ql-vscode/package-lock.json
+
+      - name: Install dependencies
+        working-directory: extensions/ql-vscode
+        run: |
+          npm ci
+        shell: bash
+
+      - name: Build
+        working-directory: extensions/ql-vscode
+        run: |
+          npm run build
+        shell: bash
+
+      - name: Decide on ref of CodeQL repo
+        id: choose-ref
+        shell: bash
+        run: |
+          if [[ "${{ matrix.version }}" == "nightly" ]]
+          then
+            REF="codeql-cli/latest"
+          else
+            REF="codeql-cli/${{ matrix.version }}"
+          fi
+          echo "ref=$REF" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout QL
+        uses: actions/checkout@v3
+        with:
+          repository: github/codeql
+          ref: ${{ steps.choose-ref.outputs.ref }}
+          path: codeql
+
+      - name: Run CLI tests (Linux)
+        working-directory: extensions/ql-vscode
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          unset DBUS_SESSION_BUS_ADDRESS
+          /usr/bin/xvfb-run npm run test:cli-integration
+
+      - name: Run CLI tests (Windows)
+        working-directory: extensions/ql-vscode
+        if: matrix.os == 'windows-latest'
+        run: |
+          npm run test:cli-integration

.github/workflows/main.yml

@@ -53,22 +53,6 @@ jobs:
           name: vscode-codeql-extension
           path: artifacts
 
-  find-nightly:
-    name: Find Nightly Release
-    runs-on: ubuntu-latest
-    outputs:
-      url: ${{ steps.get-url.outputs.nightly-url }}
-    steps:
-      - name: Get Nightly Release URL
-        id: get-url
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        shell: bash
-        # This workflow step gets an unstable testing version of the CodeQL CLI. It should not be used outside of these tests.
-        run: |
-          LATEST=`gh api repos/dsp-testing/codeql-cli-nightlies/releases --jq '.[].tag_name' --method GET --raw-field 'per_page=1'`
-          echo "nightly-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/$LATEST" >> "$GITHUB_OUTPUT"
-
   lint:
     name: Lint
     runs-on: ubuntu-latest
@@ -198,31 +182,31 @@ jobs:
         run: |
           npm run test:vscode-integration
 
-  set-matrix:
-    name: Set Matrix for cli-test
+  get-latest-cli-version:
+    name: Get latest CLI version
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set the variables
-        id: set-variables
-        run: echo "cli-versions=$(cat ./extensions/ql-vscode/supported_cli_versions.json | jq -rc)" >> $GITHUB_OUTPUT
+      - name: Set the variable
+        id: set-variable
+        run: |
+          echo "cli-version=$(cat ./extensions/ql-vscode/supported_cli_versions.json | jq -rc '.[0]')" >> $GITHUB_OUTPUT
+          echo "$cli-version"
     outputs:
-      cli-versions: ${{ steps.set-variables.outputs.cli-versions }}
+      cli-version: ${{ steps.set-variable.outputs.cli-version }}
 
   cli-test:
     name: CLI Test
     runs-on: ${{ matrix.os }}
-    needs: [find-nightly, set-matrix]
+    needs: [get-latest-cli-version]
     timeout-minutes: 30
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        version: ${{ fromJson(needs.set-matrix.outputs.cli-versions) }}
       fail-fast: false
     env:
-      CLI_VERSION: ${{ matrix.version }}
-      NIGHTLY_URL: ${{ needs.find-nightly.outputs.url }}
+      CLI_VERSION: ${{ needs.get-latest-cli-version.outputs.cli-version }}
       TEST_CODEQL_PATH: '${{ github.workspace }}/codeql'
 
     steps:
@@ -247,23 +231,11 @@ jobs:
           npm run build
         shell: bash
 
-      - name: Decide on ref of CodeQL repo
-        id: choose-ref
-        shell: bash
-        run: |
-          if [[ "${{ matrix.version }}" == "nightly" ]]
-          then
-            REF="codeql-cli/latest"
-          else
-            REF="codeql-cli/${{ matrix.version }}"
-          fi
-          echo "ref=$REF" >> "$GITHUB_OUTPUT"
-
       - name: Checkout QL
         uses: actions/checkout@v3
         with:
           repository: github/codeql
-          ref: ${{ steps.choose-ref.outputs.ref }}
+          ref: 'codeql-cli/${{ needs.get-latest-cli-version.outputs.cli-version }}'
           path: codeql
 
       - name: Run CLI tests (Linux)

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

docs/releasing.md

@@ -1,5 +1,6 @@
 # Releasing (write access required)
 
+1. Run the ["Run CLI tests" workflow](https://github.com/github/vscode-codeql/actions/workflows/cli-test.yml) and make sure the tests are green. If there were no merges between the time the workflow ran (it runs daily), and the release, you can skip this step.  
 1. Double-check the `CHANGELOG.md` contains all desired change comments and has the version to be released with date at the top.
     * Go through all recent PRs and make sure they are properly accounted for.
     * Make sure all changelog entries have links back to their PR(s) if appropriate.

docs/testing.md

@@ -133,4 +133,4 @@ Once the scenario has been recorded, it's often useful to remove some of the req
 
 ### Scenario data location
 
-Pre-recorded scenarios are stored in `./src/variant-analysis/github-api/mocks/scenarios`. However, it's possible to configure the location, by setting the `codeQL.mockGitHubApiServer.scenariosPath` configuration property in the VS Code user settings.
+Pre-recorded scenarios are stored in `./src/common/mock-gh-api/scenarios`. However, it's possible to configure the location, by setting the `codeQL.mockGitHubApiServer.scenariosPath` configuration property in the VS Code user settings.

extensions/ql-vscode/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CodeQL for Visual Studio Code: Changelog
 
+## 1.8.11 - 7 September 2023
+
+- 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)
+
 ## 1.8.10 - 15 August 2023
 
 - Add a code lens to make the `CodeQL: Open Referenced File` command more discoverable. Click the "Open referenced file" prompt in a `.qlref` file to jump to the referenced `.ql` file. [#2704](https://github.com/github/vscode-codeql/pull/2704)

extensions/ql-vscode/package.json

@@ -4,7 +4,7 @@
   "description": "CodeQL for Visual Studio Code",
   "author": "GitHub",
   "private": true,
-  "version": "1.8.10",
+  "version": "1.8.11",
   "publisher": "GitHub",
   "license": "MIT",
   "icon": "media/VS-marketplace-CodeQL-icon.png",
@@ -182,16 +182,25 @@
         "path": "./snippets.json"
       }
     ],
-    "configuration": {
+    "configuration": [
+      {
         "type": "object",
-      "title": "CodeQL",
+        "title": "CLI",
+        "order": 0,
         "properties": {
           "codeQL.cli.executablePath": {
             "scope": "machine-overridable",
             "type": "string",
             "default": "",
             "markdownDescription": "Path to the CodeQL executable that should be used by the CodeQL extension. The executable is named `codeql` on Linux/Mac and `codeql.exe` on Windows. If empty, the extension will look for a CodeQL executable on your shell PATH, or if CodeQL is not on your PATH, download and manage its own CodeQL executable (note: if you later introduce CodeQL on your PATH, the extension will prefer a CodeQL executable it has downloaded itself)."
+          }
+        }
       },
+      {
+        "type": "object",
+        "title": "Running queries",
+        "order": 1,
+        "properties": {
           "codeQL.runningQueries.numberOfThreads": {
             "type": "integer",
             "default": 1,
@@ -281,12 +290,26 @@
               "Use all extension packs found in the workspace."
             ],
             "description": "Choose whether or not to run queries using extension packs. Requires CodeQL CLI v2.12.3 or later."
+          }
+        }
       },
+      {
+        "type": "object",
+        "title": "Results",
+        "order": 2,
+        "properties": {
           "codeQL.resultsDisplay.pageSize": {
             "type": "integer",
             "default": 200,
             "description": "Max number of query results to display per page in the results view."
+          }
+        }
       },
+      {
+        "type": "object",
+        "title": "Query history",
+        "order": 3,
+        "properties": {
           "codeQL.queryHistory.format": {
             "type": "string",
             "default": "%q on %d - %s %r [%t]",
@@ -297,7 +320,14 @@
             "default": 30,
             "description": "Number of days to retain queries in the query history before being automatically deleted.",
             "scope": "machine"
+          }
+        }
       },
+      {
+        "type": "object",
+        "title": "Running tests",
+        "order": 4,
+        "properties": {
           "codeQL.runningTests.additionalTestArguments": {
             "scope": "window",
             "type": "array",
@@ -311,19 +341,14 @@
             "minimum": 0,
             "maximum": 1024,
             "description": "Number of threads for running CodeQL tests."
+          }
+        }
       },
-        "codeQL.telemetry.enableTelemetry": {
-          "type": "boolean",
-          "default": false,
-          "scope": "application",
-          "markdownDescription": "Specifies whether to send CodeQL usage telemetry. This setting AND the global `#telemetry.enableTelemetry#` setting must be checked for telemetry to be sent to GitHub. For more information, see the [telemetry documentation](https://codeql.github.com/docs/codeql-for-visual-studio-code/about-telemetry-in-codeql-for-visual-studio-code)"
-        },
-        "codeQL.telemetry.logTelemetry": {
-          "type": "boolean",
-          "default": false,
-          "scope": "application",
-          "description": "Specifies whether or not to write telemetry events to the extension log."
-        },
+      {
+        "type": "object",
+        "title": "Variant analysis",
+        "order": 5,
+        "properties": {
           "codeQL.variantAnalysis.controllerRepo": {
             "type": "string",
             "default": "",
@@ -358,19 +383,26 @@
               "Sort repositories by number of results in the results view."
             ],
             "description": "The default sorting order for repositories in the variant analysis results view."
+          }
+        }
       },
-        "codeQL.logInsights.joinOrderWarningThreshold": {
-          "type": "number",
-          "default": 50,
-          "scope": "window",
-          "minimum": 0,
-          "description": "Report a warning for any join order whose metric exceeds this value."
-        },
+      {
+        "type": "object",
+        "title": "Downloading databases",
+        "order": 6,
+        "properties": {
           "codeQL.databaseDownload.allowHttp": {
             "type": "boolean",
             "default": false,
             "description": "Allow database to be downloaded via HTTP. Warning: enabling this option will allow downloading from insecure servers."
+          }
+        }
       },
+      {
+        "type": "object",
+        "title": "Creating queries",
+        "order": 7,
+        "properties": {
           "codeQL.createQuery.qlPackLocation": {
             "type": "string",
             "patternErrorMessage": "Please enter a valid folder",
@@ -391,6 +423,40 @@
           }
         }
       },
+      {
+        "type": "object",
+        "title": "Log insights",
+        "order": 8,
+        "properties": {
+          "codeQL.logInsights.joinOrderWarningThreshold": {
+            "type": "number",
+            "default": 50,
+            "scope": "window",
+            "minimum": 0,
+            "description": "Report a warning for any join order whose metric exceeds this value."
+          }
+        }
+      },
+      {
+        "type": "object",
+        "title": "Telemetry",
+        "order": 9,
+        "properties": {
+          "codeQL.telemetry.enableTelemetry": {
+            "type": "boolean",
+            "default": false,
+            "scope": "application",
+            "markdownDescription": "Specifies whether to send CodeQL usage telemetry. This setting AND the global `#telemetry.enableTelemetry#` setting must be checked for telemetry to be sent to GitHub. For more information, see the [telemetry documentation](https://codeql.github.com/docs/codeql-for-visual-studio-code/about-telemetry-in-codeql-for-visual-studio-code)"
+          },
+          "codeQL.telemetry.logTelemetry": {
+            "type": "boolean",
+            "default": false,
+            "scope": "application",
+            "description": "Specifies whether or not to write telemetry events to the extension log."
+          }
+        }
+      }
+    ],
     "commands": [
       {
         "command": "codeQL.authenticateToGitHub",
@@ -531,6 +597,11 @@
         "command": "codeQLQueries.runVariantAnalysisContextMenu",
         "title": "Run against variant analysis repositories"
       },
+      {
+        "command": "codeQLQueries.createQuery",
+        "title": "Create query",
+        "icon": "$(new-file)"
+      },
       {
         "command": "codeQLVariantAnalysisRepositories.openConfigFile",
         "title": "Open database configuration file",
@@ -877,8 +948,8 @@
         "enablement": "codeql.hasQLSource"
       },
       {
-        "command": "codeQL.openDataExtensionsEditor",
-        "title": "CodeQL: Open Data Extensions Editor"
+        "command": "codeQL.openModelEditor",
+        "title": "CodeQL: Open CodeQL Model Editor (Beta)"
       },
       {
         "command": "codeQL.mockGitHubApiServer.startRecording",
@@ -940,6 +1011,11 @@
           "when": "view == codeQLDatabases",
           "group": "navigation"
         },
+        {
+          "command": "codeQLQueries.createQuery",
+          "when": "view == codeQLQueries",
+          "group": "navigation"
+        },
         {
           "command": "codeQLQueryHistory.sortByName",
           "when": "view == codeQLQueryHistory",
@@ -1224,6 +1300,10 @@
           "command": "codeQLQueries.runLocalQueriesFromPanel",
           "when": "false"
         },
+        {
+          "command": "codeQLQueries.createQuery",
+          "when": "false"
+        },
         {
           "command": "codeQL.runLocalQueryFromFileTab",
           "when": "false"
@@ -1349,8 +1429,8 @@
           "when": "false"
         },
         {
-          "command": "codeQL.openDataExtensionsEditor",
-          "when": "config.codeQL.canary && config.codeQL.dataExtensions.editor"
+          "command": "codeQL.openModelEditor",
+          "when": "config.codeQL.canary && config.codeQL.model.editor"
         },
         {
           "command": "codeQLQueries.runLocalQueryContextMenu",
@@ -1586,7 +1666,7 @@
         },
         {
           "command": "codeQL.createQuery",
-          "when": "config.codeQL.codespacesTemplate"
+          "when": "config.codeQL.codespacesTemplate || config.codeQL.canary && config.codeQL.queriesPanel"
         },
         {
           "command": "codeQLTests.acceptOutputContextTestItem",
@@ -1658,8 +1738,8 @@
       ],
       "panel": [
         {
-          "id": "codeql-model-details",
-          "title": "CodeQL Model Details",
+          "id": "codeql-methods-usage",
+          "title": "CodeQL Methods Usage",
           "icon": "media/logo.svg"
         }
       ]
@@ -1693,17 +1773,25 @@
           "when": "config.codeQL.canary"
         }
       ],
-      "codeql-model-details": [
+      "codeql-methods-usage": [
         {
-          "id": "codeQLModelDetails",
-          "name": "CodeQL Model Details",
-          "when": "config.codeQL.canary && config.codeQL.dataExtensions.modelDetailsView"
+          "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.model.methodModelingView && codeql.modelEditorOpen"
         }
       ]
     },
     "viewsWelcome": [
       {
-        "view": "codeQLModelDetails",
+        "view": "codeQLMethodsUsage",
         "contents": "Loading..."
       },
       {
@@ -1716,7 +1804,8 @@
       },
       {
         "view": "codeQLQueries",
-        "contents": "Looking for queries..."
+        "contents": "We didn't find any CodeQL queries in this workspace. [Create one to get started](command:codeQLQueries.createQuery).",
+        "when": "codeQL.noQueries"
       },
       {
         "view": "codeQLDatabases",
@@ -1816,7 +1905,7 @@
     "@storybook/react-webpack5": "^7.1.0",
     "@storybook/theming": "^7.1.0",
     "@testing-library/dom": "^9.3.0",
-    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/child-process-promise": "^2.2.1",
@@ -1876,7 +1965,7 @@
     "jest": "^29.0.3",
     "jest-environment-jsdom": "^29.0.3",
     "jest-runner-vscode": "^3.0.1",
-    "lint-staged": "^13.2.0",
+    "lint-staged": "^14.0.0",
     "markdownlint-cli2": "^0.6.0",
     "markdownlint-cli2-formatter-pretty": "^0.0.4",
     "mini-css-extract-plugin": "^2.6.1",

extensions/ql-vscode/scripts/add-fields-to-scenarios.ts

@@ -18,15 +18,15 @@ import { Octokit, type RestEndpointMethodTypes } from "@octokit/rest";
 import { throttling } from "@octokit/plugin-throttling";
 
 import { getFiles } from "./util/files";
-import type { GitHubApiRequest } from "../src/variant-analysis/gh-api/mocks/gh-api-request";
-import { isGetVariantAnalysisRequest } from "../src/variant-analysis/gh-api/mocks/gh-api-request";
+import type { GitHubApiRequest } from "../src/common/mock-gh-api/gh-api-request";
+import { isGetVariantAnalysisRequest } from "../src/common/mock-gh-api/gh-api-request";
 import { VariantAnalysis } from "../src/variant-analysis/gh-api/variant-analysis";
 import { RepositoryWithMetadata } from "../src/variant-analysis/gh-api/repository";
 
 const extensionDirectory = resolve(__dirname, "..");
 const scenariosDirectory = resolve(
   extensionDirectory,
-  "src/variant-analysis/gh-api/mocks/scenarios",
+  "src/common/mock-gh-api/scenarios",
 );
 
 // Make sure we don't run into rate limits by automatically waiting until we can

extensions/ql-vscode/scripts/fix-scenario-file-numbering.ts

@@ -22,7 +22,7 @@ const scenarioName = process.argv[2];
 const extensionDirectory = resolve(__dirname, "..");
 const scenariosDirectory = resolve(
   extensionDirectory,
-  "src/variant-analysis/gh-api/mocks/scenarios",
+  "src/common/mock-gh-api/scenarios",
 );
 const scenarioDirectory = resolve(scenariosDirectory, scenarioName);
 

extensions/ql-vscode/scripts/lint-scenarios.ts

@@ -10,7 +10,7 @@ const extensionDirectory = resolve(__dirname, "..");
 const rootDirectory = resolve(extensionDirectory, "../..");
 const scenariosDirectory = resolve(
   extensionDirectory,
-  "src/variant-analysis/gh-api/mocks/scenarios",
+  "src/common/mock-gh-api/scenarios",
 );
 
 const debug = process.env.RUNNER_DEBUG || process.argv.includes("--debug");
@@ -19,7 +19,7 @@ async function lintScenarios() {
   const schema = createGenerator({
     path: resolve(
       extensionDirectory,
-      "src/variant-analysis/gh-api/mocks/gh-api-request.ts",
+      "src/common/mock-gh-api/gh-api-request.ts",
     ),
     tsconfig: resolve(extensionDirectory, "tsconfig.json"),
     type: "GitHubApiRequest",

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/method";
 
 // A command function matching the signature that VS Code calls when
 // a command is invoked from a context menu on a TreeView with
@@ -135,6 +135,7 @@ export type LocalQueryCommands = {
   "codeQLQueries.runLocalQueryContextMenu": TreeViewContextSingleSelectionCommandFunction<QueryTreeViewItem>;
   "codeQLQueries.runLocalQueriesContextMenu": TreeViewContextSingleSelectionCommandFunction<QueryTreeViewItem>;
   "codeQLQueries.runLocalQueriesFromPanel": TreeViewContextSingleSelectionCommandFunction<QueryTreeViewItem>;
+  "codeQLQueries.createQuery": () => Promise<void>;
   "codeQL.runLocalQueryFromFileTab": (uri: Uri) => Promise<void>;
   "codeQL.runQueries": ExplorerSelectionCommandFunction<Uri>;
   "codeQL.quickEval": (uri: Uri) => Promise<void>;
@@ -302,9 +303,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 +348,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 { Method, Usage } from "../model-editor/method";
+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,13 +491,13 @@ export type ToDataFlowPathsMessage = SetDataFlowPathsMessage;
 export type FromDataFlowPathsMessage = CommonFromViewMessages;
 
 interface SetExtensionPackStateMessage {
-  t: "setDataExtensionEditorViewState";
-  viewState: DataExtensionEditorViewState;
+  t: "setModelEditorViewState";
+  viewState: ModelEditorViewState;
 }
 
-interface SetExternalApiUsagesMessage {
-  t: "setExternalApiUsages";
-  externalApiUsages: ExternalApiUsage[];
+interface SetMethodsMessage {
+  t: "setMethods";
+  methods: Method[];
 }
 
 interface LoadModeledMethodsMessage {
@@ -526,6 +523,7 @@ interface SwitchModeMessage {
 
 interface JumpToUsageMessage {
   t: "jumpToUsage";
+  method: Method;
   usage: Usage;
 }
 
@@ -537,29 +535,29 @@ interface OpenExtensionPackMessage {
   t: "openExtensionPack";
 }
 
-interface RefreshExternalApiUsages {
-  t: "refreshExternalApiUsages";
+interface RefreshMethods {
+  t: "refreshMethods";
 }
 
 interface SaveModeledMethods {
   t: "saveModeledMethods";
-  externalApiUsages: ExternalApiUsage[];
+  methods: Method[];
   modeledMethods: Record<string, ModeledMethod>;
 }
 
-interface GenerateExternalApiMessage {
-  t: "generateExternalApi";
+interface GenerateMethodMessage {
+  t: "generateMethod";
 }
 
-interface GenerateExternalApiFromLlmMessage {
-  t: "generateExternalApiFromLlm";
+interface GenerateMethodsFromLlmMessage {
+  t: "generateMethodsFromLlm";
   packageName: string;
-  externalApiUsages: ExternalApiUsage[];
+  methods: Method[];
   modeledMethods: Record<string, ModeledMethod>;
 }
 
-interface StopGeneratingExternalApiFromLlmMessage {
-  t: "stopGeneratingExternalApiFromLlm";
+interface StopGeneratingMethodsFromLlmMessage {
+  t: "stopGeneratingMethodsFromLlm";
   packageName: string;
 }
 
@@ -567,22 +565,39 @@ interface ModelDependencyMessage {
   t: "modelDependency";
 }
 
-export type ToDataExtensionsEditorMessage =
+interface HideModeledApisMessage {
+  t: "hideModeledApis";
+  hideModeledApis: boolean;
+}
+
+export type ToModelEditorMessage =
   | SetExtensionPackStateMessage
-  | SetExternalApiUsagesMessage
+  | SetMethodsMessage
   | LoadModeledMethodsMessage
   | AddModeledMethodsMessage
   | SetInProgressMethodsMessage;
 
-export type FromDataExtensionsEditorMessage =
+export type FromModelEditorMessage =
   | ViewLoadedMsg
   | SwitchModeMessage
-  | RefreshExternalApiUsages
+  | RefreshMethods
   | OpenDatabaseMessage
   | OpenExtensionPackMessage
   | JumpToUsageMessage
   | SaveModeledMethods
-  | GenerateExternalApiMessage
-  | GenerateExternalApiFromLlmMessage
-  | StopGeneratingExternalApiFromLlmMessage
-  | ModelDependencyMessage;
+  | GenerateMethodMessage
+  | GenerateMethodsFromLlmMessage
+  | StopGeneratingMethodsFromLlmMessage
+  | ModelDependencyMessage
+  | HideModeledApisMessage;
+
+export type FromMethodModelingMessage =
+  | TelemetryMessage
+  | UnhandledErrorMessage;
+
+interface SetMethodMessage {
+  t: "setMethod";
+  method: Method;
+}
+
+export type ToMethodModelingMessage = SetMethodMessage;

extensions/ql-vscode/src/common/mock-gh-api/gh-api-request.ts

@@ -1,5 +1,8 @@
-import { Repository } from "../repository";
-import { VariantAnalysis, VariantAnalysisRepoTask } from "../variant-analysis";
+import { Repository } from "../../variant-analysis/gh-api/repository";
+import {
+  VariantAnalysis,
+  VariantAnalysisRepoTask,
+} from "../../variant-analysis/gh-api/variant-analysis";
 
 // Types that represent requests/responses from the GitHub API
 // that we need to mock.

extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts

@@ -2,11 +2,11 @@ import { join, resolve } from "path";
 import { pathExists } from "fs-extra";
 import { setupServer, SetupServer } from "msw/node";
 
-import { DisposableObject } from "../../../common/disposable-object";
+import { DisposableObject } from "../disposable-object";
 
 import { Recorder } from "./recorder";
 import { createRequestHandlers } from "./request-handlers";
-import { getDirectoryNamesInsidePath } from "../../../common/files";
+import { getDirectoryNamesInsidePath } from "../files";
 
 /**
  * Enables mocking of the GitHub API server via HTTP interception, using msw.
@@ -129,11 +129,11 @@ export class MockGitHubApiServer extends DisposableObject {
 
   public async getDefaultScenariosPath(): Promise<string | undefined> {
     // This should be the directory where package.json is located
-    const rootDirectory = resolve(__dirname, "../../../..");
+    const rootDirectory = resolve(__dirname, "../../..");
 
     const scenariosPath = resolve(
       rootDirectory,
-      "src/variant-analysis/gh-api/mocks/scenarios",
+      "src/common/mock-gh-api/scenarios",
     );
     if (await pathExists(scenariosPath)) {
       return scenariosPath;

extensions/ql-vscode/src/common/mock-gh-api/recorder.ts

@@ -8,7 +8,7 @@ import { IsomorphicResponse } from "@mswjs/interceptors";
 import { Headers } from "headers-polyfill";
 import fetch from "node-fetch";
 
-import { DisposableObject } from "../../../common/disposable-object";
+import { DisposableObject } from "../disposable-object";
 
 import {
   GetVariantAnalysisRepoResultRequest,

extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/19-getVariantAnalysisRepoResult.json

@@ -5,7 +5,7 @@
   },
   "response": {
     "status": 200,
-    "body": "file:20-getVariantAnalysisRepoResult.body.zip",
+    "body": "file:19-getVariantAnalysisRepoResult.body.zip",
     "contentType": "application/zip"
   }
 }