Add expandMacro command (#176)

lukaszsamson · web-flow · commit b8453818f598 · 2021-03-06T11:36:59.000-10:00
* add expandMacro command

* update elixir-ls

* cleanup

* get command name with server instance id from initialise result

* update ex
diff --git a/elixir-ls b/elixir-ls
@@ -1 +1 @@
-Subproject commit dccd34dbd856ae34efc925d014c6f84012549c90
+Subproject commit 7fa1f5840be4ca0c02647d27b790122810d5ac22
diff --git a/package.json b/package.json
@@ -394,13 +394,21 @@
       {
         "command": "extension.copyDebugInfo",
         "title": "ElixirLS: Copy Debug Info"
+      },
+      {
+        "command": "extension.expandMacro",
+        "title": "ElixirLS: Expand macro"
       }
     ],
     "menus": {
       "commandPalette": [
         {
           "command": "extension.copyDebugInfo",
           "when": "editorLangId == elixir || editorLangId == eex || editorLangId == html-eex"
+        },
+        {
+          "command": "extension.expandMacro",
+          "title": "editorLangId == elixir"
         }
       ]
     }
diff --git a/src/extension.ts b/src/extension.ts
@@ -11,10 +11,11 @@ import * as path from "path";
 
 import { workspace, ExtensionContext, WorkspaceFolder, Uri } from "vscode";
 import {
+  ExecuteCommandParams,
   LanguageClient,
   LanguageClientOptions,
   RevealOutputChannelOn,
-  ServerOptions,
+  ServerOptions
 } from "vscode-languageclient";
 import * as os from "os";
 import Commands from "./constants/commands";
@@ -28,6 +29,8 @@ interface TerminalLinkWithData extends vscode.TerminalLink {
   }
 }
 
+const ExpandMacroTitle = 'Expand macro result'
+
 export let defaultClient: LanguageClient;
 const clients: Map<string, LanguageClient> = new Map();
 let _sortedWorkspaceFolders: string[] | undefined;
@@ -139,6 +142,79 @@ function configureCopyDebugInfo(context: ExtensionContext) {
   context.subscriptions.push(disposable);
 }
 
+function getExpandMacroWebviewContent(content: Record<string, string>) {
+  let body = "";
+  for (const [key, value] of Object.entries(content)) {
+    body += `<div>
+      <h4>${key}</h4>
+      <code><pre>${value}</pre></code>
+    </div>`
+  }
+
+  return `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>${ExpandMacroTitle}</title>
+</head>
+<body>
+  ${body}
+</body>
+</html>`;
+}
+
+function configureExpandMacro(context: ExtensionContext) {
+  const disposable = vscode.commands.registerCommand("extension.expandMacro", async () => {
+    const extension = vscode.extensions.getExtension("jakebecker.elixir-ls");
+    const editor = vscode.window.activeTextEditor;
+    if (!extension || !editor) {
+      return;
+    }
+
+    const uri = editor.document.uri;
+    let client = null;
+    if (uri.scheme === "untitled") {
+      client = defaultClient;
+    } else {
+      let folder = workspace.getWorkspaceFolder(uri);
+      
+      if (folder) {
+        folder = getOuterMostWorkspaceFolder(folder);
+        client = clients.get(folder.uri.toString())
+      }
+    }
+
+    if (!client) {
+      return;
+    }
+
+    if (editor.selection.isEmpty) {
+      return;
+    }
+
+    const command = client.initializeResult!.capabilities.executeCommandProvider!.commands
+      .find(c => c.startsWith("expandMacro:"))!;
+
+    const params: ExecuteCommandParams = {
+      command: command,
+      arguments: [uri.toString(), editor.document.getText(editor.selection), editor.selection.start.line]
+    };
+
+    const res: Record<string, string> = await client.sendRequest("workspace/executeCommand", params);
+
+    const panel = vscode.window.createWebviewPanel(
+      'expandMacro',
+      ExpandMacroTitle,
+      vscode.ViewColumn.One,
+      {}
+    );
+    panel.webview.html = getExpandMacroWebviewContent(res);
+  });
+  
+  context.subscriptions.push(disposable);
+}
+
 class DebugAdapterExecutableFactory implements vscode.DebugAdapterDescriptorFactory {
   createDebugAdapterDescriptor(session: vscode.DebugSession, executable: vscode.DebugAdapterExecutable): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
     if (session.workspaceFolder) {
@@ -233,6 +309,7 @@ export function activate(context: ExtensionContext): void {
 
   configureRunTestFromCodeLens()
   configureCopyDebugInfo(context);
+  configureExpandMacro(context);
   configureDebugger(context);
   configureTerminalLinkProvider(context);
 

Original file line number	Diff line number	Diff line change
`@@ -394,13 +394,21 @@`
`394`	`394`	`{`
`395`	`395`	`"command": "extension.copyDebugInfo",`
`396`	`396`	`"title": "ElixirLS: Copy Debug Info"`
	`397`	`+ },`
	`398`	`+ {`
	`399`	`+ "command": "extension.expandMacro",`
	`400`	`+ "title": "ElixirLS: Expand macro"`
`397`	`401`	`}`
`398`	`402`	`],`
`399`	`403`	`"menus": {`
`400`	`404`	`"commandPalette": [`
`401`	`405`	`{`
`402`	`406`	`"command": "extension.copyDebugInfo",`
`403`	`407`	`"when": "editorLangId == elixir \|\| editorLangId == eex \|\| editorLangId == html-eex"`
	`408`	`+ },`
	`409`	`+ {`
	`410`	`+ "command": "extension.expandMacro",`
	`411`	`+ "title": "editorLangId == elixir"`
`404`	`412`	`}`
`405`	`413`	`]`
`406`	`414`	`}`