Change displayBuildTarget to listBuildTargets

scalameta · Feb 24, 2022 · d53c4d2 · d53c4d2
1 parent 4fb88f8
commit d53c4d2
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -894,7 +894,7 @@
   },
   "dependencies": {
     "ansicolor": "^1.1.100",
-    "metals-languageclient": "0.5.8",
+    "metals-languageclient": "0.5.9",
     "promisify-child-process": "4.1.1",
     "vscode-languageclient": "7.0.0"
   },

diff --git a/src/extension.ts b/src/extension.ts
@@ -567,6 +567,40 @@ function launchMetals(
         );
       });
 
+      function displayBuildTarget(target: string): void {
+        const workspaceRoots = workspace.workspaceFolders;
+        if (workspaceRoots && workspaceRoots.length > 0) {
+          const uriStr = `metalsDecode:file:///${workspaceRoots[0].name}/${target}.metals-buildtarget`;
+          const uri = Uri.parse(uriStr);
+          workspace
+            .openTextDocument(uri)
+            .then((textDocument) => window.showTextDocument(textDocument));
+        }
+      }
+
+      registerCommand(`metals.target-info-display`, async (...args: any[]) => {
+        if (args.length > 0) {
+          // get build target name from treeview uri of the form "projects:file:/root/metals/.mtags/?id=mtags3!/_root_/"
+          const treeViewUri = args[0] as string;
+          const query = treeViewUri.split("/?id=");
+          if (query.length > 1) {
+            const buildTarget = query[1].split("!");
+            if (buildTarget.length > 0) {
+              displayBuildTarget(buildTarget[0]);
+            }
+          }
+        } else {
+          // pick from list of targets
+          const targets = await client.sendRequest(ExecuteCommandRequest.type, {
+            command: ServerCommands.ListBuildTargets,
+          });
+          const picked = await window.showQuickPick(targets);
+          if (picked) {
+            displayBuildTarget(picked);
+          }
+        }
+      });
+
       let channelOpen = false;
 
       registerCommand(ClientCommands.FocusDiagnostics, () =>
@@ -577,16 +611,6 @@ function launchMetals(
         commands.executeCommand(ClientCommands.RunDoctor)
       );
 
-      registerCommand(
-        `metals.${ServerCommands.DisplayTargetInfo}`,
-        (...args) => {
-          client.sendRequest(ExecuteCommandRequest.type, {
-            command: ServerCommands.DisplayTargetInfo,
-            arguments: args,
-          });
-        }
-      );
-
       registerCommand(ClientCommands.ToggleLogs, () => {
         if (channelOpen) {
           client.outputChannel.hide();

diff --git a/yarn.lock b/yarn.lock
@@ -1407,10 +1407,10 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-metals-languageclient@0.5.8:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/metals-languageclient/-/metals-languageclient-0.5.8.tgz#7d6975c7f77b9d798b200c28646ed28e83911f1e"
-  integrity sha512-Ah7/IniDC4SEKZw1tq6Xb2h9keyfi/rbzw0OmRxaH9vN18/9siwxsXnKUTd6gFb6w0LaymvotHqsd5yneuoXBA==
+metals-languageclient@0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/metals-languageclient/-/metals-languageclient-0.5.9.tgz#bd923367fdb6bf8fe0258e28a2f10ea4dd5349c4"
+  integrity sha512-dD7O4zXcQIjVk7TtRuGgGACavX5zT+W6fa2ANgS3rhmiibNezdBzhzlbpjms4EQXeVKUsqSzQvqlK+IGdKfcjA==
   dependencies:
     "@viperproject/locate-java-home" "^1.1.5"
     fp-ts "^2.4.1"