diff options
author | Benjamin Coenen <[email protected]> | 2020-05-10 11:31:55 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-05-10 11:31:55 +0100 |
commit | e80903a96564c2239489a8c630a4748bf21a3659 (patch) | |
tree | 12b31a1fd12deb2120065cea5a558425c8c1984f /editors/code/src/cargo.ts | |
parent | 6203e9c4faee288f16d93dbb7dd0f1f8df487d83 (diff) | |
parent | 4578154b608fa075595103d0c933da60d55b25c8 (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into feat_4348
Diffstat (limited to 'editors/code/src/cargo.ts')
-rw-r--r-- | editors/code/src/cargo.ts | 81 |
1 files changed, 49 insertions, 32 deletions
diff --git a/editors/code/src/cargo.ts b/editors/code/src/cargo.ts index a328ba9bd..2a2c2e0e1 100644 --- a/editors/code/src/cargo.ts +++ b/editors/code/src/cargo.ts | |||
@@ -1,6 +1,9 @@ | |||
1 | import * as cp from 'child_process'; | 1 | import * as cp from 'child_process'; |
2 | import * as os from 'os'; | ||
3 | import * as path from 'path'; | ||
2 | import * as readline from 'readline'; | 4 | import * as readline from 'readline'; |
3 | import { OutputChannel } from 'vscode'; | 5 | import { OutputChannel } from 'vscode'; |
6 | import { isValidExecutable } from './util'; | ||
4 | 7 | ||
5 | interface CompilationArtifact { | 8 | interface CompilationArtifact { |
6 | fileName: string; | 9 | fileName: string; |
@@ -10,17 +13,9 @@ interface CompilationArtifact { | |||
10 | } | 13 | } |
11 | 14 | ||
12 | export class Cargo { | 15 | export class Cargo { |
13 | rootFolder: string; | 16 | constructor(readonly rootFolder: string, readonly output: OutputChannel) { } |
14 | env?: Record<string, string>; | ||
15 | output: OutputChannel; | ||
16 | |||
17 | public constructor(cargoTomlFolder: string, output: OutputChannel, env: Record<string, string> | undefined = undefined) { | ||
18 | this.rootFolder = cargoTomlFolder; | ||
19 | this.output = output; | ||
20 | this.env = env; | ||
21 | } | ||
22 | 17 | ||
23 | public async artifactsFromArgs(cargoArgs: string[]): Promise<CompilationArtifact[]> { | 18 | private async artifactsFromArgs(cargoArgs: string[]): Promise<CompilationArtifact[]> { |
24 | const artifacts: CompilationArtifact[] = []; | 19 | const artifacts: CompilationArtifact[] = []; |
25 | 20 | ||
26 | try { | 21 | try { |
@@ -37,17 +32,13 @@ export class Cargo { | |||
37 | isTest: message.profile.test | 32 | isTest: message.profile.test |
38 | }); | 33 | }); |
39 | } | 34 | } |
40 | } | 35 | } else if (message.reason === 'compiler-message') { |
41 | else if (message.reason === 'compiler-message') { | ||
42 | this.output.append(message.message.rendered); | 36 | this.output.append(message.message.rendered); |
43 | } | 37 | } |
44 | }, | 38 | }, |
45 | stderr => { | 39 | stderr => this.output.append(stderr), |
46 | this.output.append(stderr); | ||
47 | } | ||
48 | ); | 40 | ); |
49 | } | 41 | } catch (err) { |
50 | catch (err) { | ||
51 | this.output.show(true); | 42 | this.output.show(true); |
52 | throw new Error(`Cargo invocation has failed: ${err}`); | 43 | throw new Error(`Cargo invocation has failed: ${err}`); |
53 | } | 44 | } |
@@ -55,9 +46,8 @@ export class Cargo { | |||
55 | return artifacts; | 46 | return artifacts; |
56 | } | 47 | } |
57 | 48 | ||
58 | public async executableFromArgs(args: string[]): Promise<string> { | 49 | async executableFromArgs(args: readonly string[]): Promise<string> { |
59 | const cargoArgs = [...args]; // to remain args unchanged | 50 | const cargoArgs = [...args, "--message-format=json"]; |
60 | cargoArgs.push("--message-format=json"); | ||
61 | 51 | ||
62 | const artifacts = await this.artifactsFromArgs(cargoArgs); | 52 | const artifacts = await this.artifactsFromArgs(cargoArgs); |
63 | 53 | ||
@@ -70,24 +60,27 @@ export class Cargo { | |||
70 | return artifacts[0].fileName; | 60 | return artifacts[0].fileName; |
71 | } | 61 | } |
72 | 62 | ||
73 | runCargo( | 63 | private runCargo( |
74 | cargoArgs: string[], | 64 | cargoArgs: string[], |
75 | onStdoutJson: (obj: any) => void, | 65 | onStdoutJson: (obj: any) => void, |
76 | onStderrString: (data: string) => void | 66 | onStderrString: (data: string) => void |
77 | ): Promise<number> { | 67 | ): Promise<number> { |
78 | return new Promise<number>((resolve, reject) => { | 68 | return new Promise((resolve, reject) => { |
79 | const cargo = cp.spawn('cargo', cargoArgs, { | 69 | let cargoPath; |
70 | try { | ||
71 | cargoPath = getCargoPathOrFail(); | ||
72 | } catch (err) { | ||
73 | return reject(err); | ||
74 | } | ||
75 | |||
76 | const cargo = cp.spawn(cargoPath, cargoArgs, { | ||
80 | stdio: ['ignore', 'pipe', 'pipe'], | 77 | stdio: ['ignore', 'pipe', 'pipe'], |
81 | cwd: this.rootFolder, | 78 | cwd: this.rootFolder |
82 | env: this.env, | ||
83 | }); | 79 | }); |
84 | 80 | ||
85 | cargo.on('error', err => { | 81 | cargo.on('error', err => reject(new Error(`could not launch cargo: ${err}`))); |
86 | reject(new Error(`could not launch cargo: ${err}`)); | 82 | |
87 | }); | 83 | cargo.stderr.on('data', chunk => onStderrString(chunk.toString())); |
88 | cargo.stderr.on('data', chunk => { | ||
89 | onStderrString(chunk.toString()); | ||
90 | }); | ||
91 | 84 | ||
92 | const rl = readline.createInterface({ input: cargo.stdout }); | 85 | const rl = readline.createInterface({ input: cargo.stdout }); |
93 | rl.on('line', line => { | 86 | rl.on('line', line => { |
@@ -103,4 +96,28 @@ export class Cargo { | |||
103 | }); | 96 | }); |
104 | }); | 97 | }); |
105 | } | 98 | } |
106 | } \ No newline at end of file | 99 | } |
100 | |||
101 | // Mirrors `ra_env::get_path_for_executable` implementation | ||
102 | function getCargoPathOrFail(): string { | ||
103 | const envVar = process.env.CARGO; | ||
104 | const executableName = "cargo"; | ||
105 | |||
106 | if (envVar) { | ||
107 | if (isValidExecutable(envVar)) return envVar; | ||
108 | |||
109 | throw new Error(`\`${envVar}\` environment variable points to something that's not a valid executable`); | ||
110 | } | ||
111 | |||
112 | if (isValidExecutable(executableName)) return executableName; | ||
113 | |||
114 | const standardLocation = path.join(os.homedir(), '.cargo', 'bin', executableName); | ||
115 | |||
116 | if (isValidExecutable(standardLocation)) return standardLocation; | ||
117 | |||
118 | throw new Error( | ||
119 | `Failed to find \`${executableName}\` executable. ` + | ||
120 | `Make sure \`${executableName}\` is in \`$PATH\`, ` + | ||
121 | `or set \`${envVar}\` to point to a valid executable.` | ||
122 | ); | ||
123 | } | ||