Delete temporary test command

Author: shati-patel

extensions/ql-vscode/package.json

@@ -245,10 +245,6 @@
         "command": "codeQL.runQuery",
         "title": "CodeQL: Run Query"
       },
-      {
-        "command": "codeQL.findLanguage",
-        "title": "CodeQL: Find Language"
-      },
       {
         "command": "codeQL.runQueryOnMultipleDatabases",
         "title": "CodeQL: Run Query on Multiple Databases"
@@ -688,10 +684,6 @@
           "command": "codeQL.runQuery",
           "when": "resourceLangId == ql && resourceExtname == .ql"
         },
-        {
-          "command": "codeQL.findLanguage",
-          "when": "resourceLangId == ql && resourceExtname == .ql"
-        },
         {
           "command": "codeQL.runQueryOnMultipleDatabases",
           "when": "resourceLangId == ql && resourceExtname == .ql"

extensions/ql-vscode/src/cli.ts

@@ -47,7 +47,7 @@ export interface QuerySetup {
  * The expected output of `codeql resolve queries --format bylanguage`.
  */
 export interface QueryInfoByLanguage {
-  // What should the value of these objects be? I've only ever seen it as an empty object.
+  // Using `unknown` as a placeholder. For now, the value is only ever an empty object.
   byLanguage: Record<string, Record<string, unknown>>;
   noDeclaredLanguage: Record<string, unknown>;
   multipleDeclaredLanguages: Record<string, unknown>;
@@ -493,7 +493,7 @@ export class CodeQLCliServer implements Disposable {
   }
 
   /**
-   * Finds the language that a query is analyzing.
+   * Resolves the language for a query.
    * @param queryUri The URI of the query
    */
   async resolveQueryByLanguage(workspaces: string[], queryUri: Uri): Promise<QueryInfoByLanguage> {

extensions/ql-vscode/src/extension.ts

@@ -559,18 +559,30 @@ async function activateWithInstalledDistribution(
       }
     )
   );
-  // TODO: Remove this and the package.json changes
-  // (Temporary new command to test `cliServer.findLanguage`)
-  ctx.subscriptions.push(
-    commandRunner('codeQL.findLanguage', async (
-      uri: Uri
-    ) => {
-      const diskWorkspaceFolders = helpers.getOnDiskWorkspaceFolders();
-      const queryInfo = await cliServer.resolveQueryByLanguage(diskWorkspaceFolders, uri || window.activeTextEditor?.document.uri);
-      const language = (Object.keys(queryInfo.byLanguage))[0];
-      void helpers.showAndLogInformationMessage(language);
-    })
-  );
+  /**
+   * Finds the language that a query targets.
+   * If it can't be autodetected, prompt the user to specify the language manually.
+   */
+  async function findLanguage(
+    queryUri: Uri
+  ): Promise<string> {
+    let language = '';
+    try {
+      const queryInfo = await cliServer.resolveQueryByLanguage(helpers.getOnDiskWorkspaceFolders(), queryUri || window.activeTextEditor?.document.uri);
+      language = (Object.keys(queryInfo.byLanguage))[0];
+    } catch (e) {
+      // Add an option to manually specify the language, in case automatic language detection fails.
+      void logger.log('Could not autodetect query language. Select language manually.');
+      language = await window.showQuickPick(
+        ['cpp', 'csharp', 'go', 'java', 'javascript', 'ruby', 'python'],
+        { placeHolder: 'Select target language for your query', ignoreFocusOut: true }
+      ) || '';
+    }
+    if (language === '') {
+      throw new Error('Language not found');
+    }
+    return language;
+  }
   interface DatabaseQuickPickItem extends QuickPickItem {
     databaseItem: DatabaseItem;
   }