feat(lsp_ext): runnables extension

fannheyward · Jun 3, 2020 · d9e8102 · d9e8102
1 parent 2e1f709
commit d9e8102
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/commands.ts b/src/commands.ts
@@ -157,11 +157,10 @@ export function run(ctx: Ctx): Cmd {
     }
 
     const runnable = items[idx].runnable;
-    const cmd = `${runnable.bin} ${runnable.args.join(' ')}`;
+    const cmd = `${runnable.kind} ${runnable.args.cargoArgs.join(' ')}`;
     const opt: TerminalOptions = {
       name: runnable.label,
-      cwd: runnable.cwd!,
-      env: runnable.env,
+      cwd: runnable.args.workspaceRoot,
     };
     workspace.createTerminal(opt).then((t: Terminal) => {
       t.sendText(cmd);
@@ -174,11 +173,10 @@ export function runSingle(): Cmd {
     const { document } = await workspace.getCurrentState();
     if (!runnable || !isRustDocument(document)) return;
 
-    const cmd = `${runnable.bin} ${runnable.args.join(' ')}`;
+    const cmd = `${runnable.kind} ${runnable.args.cargoArgs.join(' ')}`;
     const opt: TerminalOptions = {
       name: runnable.label,
-      cwd: runnable.cwd!,
-      env: runnable.env,
+      cwd: runnable.args.workspaceRoot,
     };
     workspace.createTerminal(opt).then((t: Terminal) => {
       t.sendText(cmd);

diff --git a/src/lsp_ext.ts b/src/lsp_ext.ts
@@ -45,15 +45,16 @@ export interface RunnablesParams {
   position: lc.Position | null;
 }
 export interface Runnable {
-  range: lc.Range;
   label: string;
-  bin: string;
-  args: string[];
-  extraArgs: string[];
-  env: { [key: string]: string };
-  cwd: string | null;
+  location?: lc.LocationLink;
+  kind: 'cargo';
+  args: {
+    workspaceRoot?: string;
+    cargoArgs: string[];
+    executableArgs: string[];
+  };
 }
-export const runnables = new lc.RequestType<RunnablesParams, Runnable[], void>('rust-analyzer/runnables');
+export const runnables = new lc.RequestType<RunnablesParams, Runnable[], void>('experimental/runnables');
 
 export type InlayHint = InlayHint.TypeHint | InlayHint.ParamHint | InlayHint.ChainingHint;