diff options
author | Mikhail Rakhmanov <[email protected]> | 2020-06-02 22:22:45 +0100 |
---|---|---|
committer | Mikhail Rakhmanov <[email protected]> | 2020-06-02 22:22:45 +0100 |
commit | cb482e6351c4005f29bb89d38c64c4e3f93d7a6d (patch) | |
tree | c96d88e98c1a4fd59c37741e94faeefe465f4fb3 /editors/code/src/lsp_ext.ts | |
parent | 57cd936c5262c3b43626618be42d7a72f71c3539 (diff) | |
parent | 2f6ab77708ae104c854712285af19516287b6906 (diff) |
Merge remote-tracking branch 'upstream/master' into compute-lazy-assits
# Conflicts:
# crates/rust-analyzer/src/to_proto.rs
Diffstat (limited to 'editors/code/src/lsp_ext.ts')
-rw-r--r-- | editors/code/src/lsp_ext.ts | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts index f881bae47..35d73ce31 100644 --- a/editors/code/src/lsp_ext.ts +++ b/editors/code/src/lsp_ext.ts | |||
@@ -53,18 +53,17 @@ export interface RunnablesParams { | |||
53 | position: lc.Position | null; | 53 | position: lc.Position | null; |
54 | } | 54 | } |
55 | 55 | ||
56 | export type RunnableKind = "cargo" | "rustc" | "rustup"; | ||
57 | |||
58 | export interface Runnable { | 56 | export interface Runnable { |
59 | range: lc.Range; | ||
60 | label: string; | 57 | label: string; |
61 | kind: RunnableKind; | 58 | location?: lc.LocationLink; |
62 | args: string[]; | 59 | kind: "cargo"; |
63 | extraArgs: string[]; | 60 | args: { |
64 | env: { [key: string]: string }; | 61 | workspaceRoot?: string; |
65 | cwd: string | null; | 62 | cargoArgs: string[]; |
63 | executableArgs: string[]; | ||
64 | }; | ||
66 | } | 65 | } |
67 | export const runnables = new lc.RequestType<RunnablesParams, Runnable[], void>("rust-analyzer/runnables"); | 66 | export const runnables = new lc.RequestType<RunnablesParams, Runnable[], void>("experimental/runnables"); |
68 | 67 | ||
69 | export type InlayHint = InlayHint.TypeHint | InlayHint.ParamHint | InlayHint.ChainingHint; | 68 | export type InlayHint = InlayHint.TypeHint | InlayHint.ParamHint | InlayHint.ChainingHint; |
70 | 69 | ||