Merge pull request #3013 from github/koesie10/use-selected-language

Use selected language when creating query

Author: koesie10

extensions/ql-vscode/src/extension.ts

@@ -930,6 +930,7 @@ async function activateWithInstalledDistribution(
     databaseUI,
     localQueryResultsView,
     queryStorageDir,
+    languageContext,
   );
   ctx.subscriptions.push(localQueries);
 

extensions/ql-vscode/src/language-context-store.ts

@@ -67,4 +67,12 @@ export class LanguageContextStore extends DisposableObject {
       this.languageFilter === language
     );
   }
+
+  public get selectedLanguage(): QueryLanguage | undefined {
+    if (this.languageFilter === "All") {
+      return undefined;
+    }
+
+    return this.languageFilter;
+  }
 }

extensions/ql-vscode/src/local-queries/local-queries.ts

@@ -50,6 +50,7 @@ import { createMultiSelectionCommand } from "../common/vscode/selection-commands
 import { findLanguage } from "../codeql-cli/query-language";
 import type { QueryTreeViewItem } from "../queries-panel/query-tree-view-item";
 import { tryGetQueryLanguage } from "../common/query-language";
+import { LanguageContextStore } from "../language-context-store";
 
 interface DatabaseQuickPickItem extends QuickPickItem {
   databaseItem: DatabaseItem;
@@ -71,6 +72,7 @@ export class LocalQueries extends DisposableObject {
     private readonly databaseUI: DatabaseUI,
     private readonly localQueryResultsView: ResultsView,
     private readonly queryStorageDir: string,
+    private readonly languageContextStore: LanguageContextStore,
   ) {
     super();
   }
@@ -323,13 +325,15 @@ export class LocalQueries extends DisposableObject {
         const credentials = isCanary() ? this.app.credentials : undefined;
         const contextStoragePath =
           this.app.workspaceStoragePath || this.app.globalStoragePath;
+        const language = this.languageContextStore.selectedLanguage;
         const skeletonQueryWizard = new SkeletonQueryWizard(
           this.cliServer,
           progress,
           credentials,
           this.app.logger,
           this.databaseManager,
           contextStoragePath,
+          language,
         );
         await skeletonQueryWizard.execute();
       },

extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts

@@ -41,7 +41,6 @@ export const QUERY_LANGUAGE_TO_DATABASE_REPO: QueryLanguagesToDatabaseMap = {
 };
 
 export class SkeletonQueryWizard {
-  private language: QueryLanguage | undefined;
   private fileName = "example.ql";
   private qlPackStoragePath: string | undefined;
 
@@ -52,15 +51,19 @@ export class SkeletonQueryWizard {
     private readonly logger: BaseLogger,
     private readonly databaseManager: DatabaseManager,
     private readonly databaseStoragePath: string | undefined,
+    private language: QueryLanguage | undefined = undefined,
   ) {}
 
   private get folderName() {
     return `codeql-custom-queries-${this.language}`;
   }
 
   public async execute() {
-    // show quick pick to choose language
-    this.language = await this.chooseLanguage();
+    if (!this.language) {
+      // show quick pick to choose language
+      this.language = await this.chooseLanguage();
+    }
+
     if (!this.language) {
       return;
     }

extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts

@@ -21,6 +21,7 @@ import * as databaseFetcher from "../../../../src/databases/database-fetcher";
 import { createMockDB } from "../../../factories/databases/databases";
 import { asError } from "../../../../src/common/helpers-pure";
 import { Setting } from "../../../../src/config";
+import { QueryLanguage } from "../../../../src/common/query-language";
 
 describe("SkeletonQueryWizard", () => {
   let mockCli: CodeQLCliServer;
@@ -134,6 +135,27 @@ describe("SkeletonQueryWizard", () => {
     expect(quickPickSpy).toHaveBeenCalled();
   });
 
+  describe("with language", () => {
+    beforeEach(() => {
+      wizard = new SkeletonQueryWizard(
+        mockCli,
+        jest.fn(),
+        credentials,
+        extLogger,
+        mockDatabaseManager,
+        storagePath,
+        QueryLanguage.Swift,
+      );
+    });
+
+    it("should not prompt for language", async () => {
+      await wizard.execute();
+
+      expect(mockCli.getSupportedLanguages).not.toHaveBeenCalled();
+      expect(quickPickSpy).not.toHaveBeenCalled();
+    });
+  });
+
   describe("if QL pack doesn't exist", () => {
     beforeEach(() => {
       jest