New runnables API

2020-06-02 17:22:23 +02:00
parent f137b3a4e6
commit 0303982119
8 changed files with 108 additions and 118 deletions
--- a/editors/code/src/lsp_ext.ts
+++ b/editors/code/src/lsp_ext.ts
@@ -46,16 +46,15 @@ export interface RunnablesParams {
    position: lc.Position | null;
 }

-export type RunnableKind = "cargo" | "rustc" | "rustup";
-
 export interface Runnable {
-    range: lc.Range;
    label: string;
-    kind: RunnableKind;
-    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");