Merge branch 'main' into aeisenberg/cli-version-telemetry

Author: aeisenberg

extensions/ql-vscode/package-lock.json

@@ -1461,6 +1461,7 @@
     "fs-extra": "^11.1.1",
     "immutable": "^4.0.0",
     "js-yaml": "^4.1.0",
+    "minimatch": "^9.0.0",
     "minimist": "~1.2.6",
     "msw": "^1.2.0",
     "nanoid": "^3.2.0",
@@ -1531,7 +1532,7 @@
     "@types/through2": "^2.0.36",
     "@types/tmp": "^0.1.0",
     "@types/unzipper": "~0.10.1",
-    "@types/vscode": "^1.59.0",
+    "@types/vscode": "^1.67.0",
     "@types/webpack": "^5.28.0",
     "@types/webpack-env": "^1.18.0",
     "@types/xml2js": "~0.4.4",
@@ -1555,7 +1556,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-storybook": "^0.6.4",
     "file-loader": "^6.2.0",
-    "glob": "^9.3.2",
+    "glob": "^10.0.0",
     "gulp": "^4.0.2",
     "gulp-esbuild": "^0.10.5",
     "gulp-replace": "^1.1.3",

extensions/ql-vscode/package.json

@@ -11,6 +11,8 @@ import { showAndLogErrorMessage } from "../helpers";
 import { withProgress } from "../progress";
 import { pickExtensionPackModelFile } from "./extension-pack-picker";
 
+const SUPPORTED_LANGUAGES: string[] = ["java", "csharp"];
+
 export class DataExtensionsEditorModule {
   private readonly queryStorageDir: string;
 
@@ -51,15 +53,22 @@ export class DataExtensionsEditorModule {
 
   public getCommands(): DataExtensionsEditorCommands {
     return {
-      "codeQL.openDataExtensionsEditor": async () =>
-        withProgress(
-          async (progress) => {
-            const db = this.databaseManager.currentDatabaseItem;
-            if (!db) {
-              void showAndLogErrorMessage("No database selected");
-              return;
-            }
+      "codeQL.openDataExtensionsEditor": async () => {
+        const db = this.databaseManager.currentDatabaseItem;
+        if (!db) {
+          void showAndLogErrorMessage("No database selected");
+          return;
+        }
 
+        if (!SUPPORTED_LANGUAGES.includes(db.language)) {
+          void showAndLogErrorMessage(
+            `The data extensions editor is not supported for ${db.language} databases.`,
+          );
+          return;
+        }
+
+        return withProgress(
+          async (progress, token) => {
             if (!(await this.cliServer.cliConstraints.supportsQlpacksKind())) {
               void showAndLogErrorMessage(
                 `This feature requires CodeQL CLI version ${CliVersionConstraint.CLI_VERSION_WITH_QLPACKS_KIND.format()} or later.`,
@@ -69,7 +78,9 @@ export class DataExtensionsEditorModule {
 
             const modelFile = await pickExtensionPackModelFile(
               this.cliServer,
+              db,
               progress,
+              token,
             );
             if (!modelFile) {
               return;
@@ -90,7 +101,8 @@ export class DataExtensionsEditorModule {
           {
             title: "Opening Data Extensions Editor",
           },
-        ),
+        );
+      },
     };
   }
 

extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts

@@ -18,7 +18,7 @@ import {
   showAndLogExceptionWithTelemetry,
 } from "../helpers";
 import { extLogger } from "../common";
-import { readFile, writeFile } from "fs-extra";
+import { outputFile, readFile } from "fs-extra";
 import { load as loadYaml } from "js-yaml";
 import { DatabaseItem, DatabaseManager } from "../local-databases";
 import { CodeQLCliServer } from "../cli";
@@ -148,9 +148,13 @@ export class DataExtensionsEditorView extends AbstractWebview<
     externalApiUsages: ExternalApiUsage[],
     modeledMethods: Record<string, ModeledMethod>,
   ): Promise<void> {
-    const yaml = createDataExtensionYaml(externalApiUsages, modeledMethods);
+    const yaml = createDataExtensionYaml(
+      this.databaseItem.language,
+      externalApiUsages,
+      modeledMethods,
+    );
 
-    await writeFile(this.modelFilename, yaml);
+    await outputFile(this.modelFilename, yaml);
 
     void extLogger.log(`Saved data extension YAML to ${this.modelFilename}`);
   }
@@ -194,7 +198,6 @@ export class DataExtensionsEditorView extends AbstractWebview<
         queryRunner: this.queryRunner,
         databaseItem: this.databaseItem,
         queryStorageDir: this.queryStorageDir,
-        logger: extLogger,
         progress: (progressUpdate: ProgressUpdate) => {
           void this.showProgress(progressUpdate, 1500);
         },