diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-20 12:08:36 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-20 12:08:36 +0000 |
commit | 92b561b5c7da8303473792ba2bacb430614da2d1 (patch) | |
tree | ac34751d1957fd6fb0b015b0b884940b6b882db0 /editors/code/src/main.ts | |
parent | 467a040509cd6732de48907e025f83b57b5701b9 (diff) | |
parent | 8ee7780ca975e5709a080e66e1378ff96e20d613 (diff) |
Merge #3663
3663: Make from-source install use cargo installed binary by default r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src/main.ts')
-rw-r--r-- | editors/code/src/main.ts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 5297614a9..5d2da9a76 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts | |||
@@ -110,6 +110,7 @@ async function bootstrap(config: Config, state: PersistentState): Promise<string | |||
110 | } | 110 | } |
111 | 111 | ||
112 | async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> { | 112 | async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> { |
113 | if (config.releaseTag === undefined) return; | ||
113 | if (config.channel === "stable") { | 114 | if (config.channel === "stable") { |
114 | if (config.releaseTag === NIGHTLY_TAG) { | 115 | if (config.releaseTag === NIGHTLY_TAG) { |
115 | vscode.window.showWarningMessage(`You are running a nightly version of rust-analyzer extension. | 116 | vscode.window.showWarningMessage(`You are running a nightly version of rust-analyzer extension. |
@@ -184,6 +185,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string | |||
184 | } | 185 | } |
185 | return explicitPath; | 186 | return explicitPath; |
186 | }; | 187 | }; |
188 | if (config.releaseTag === undefined) return "rust-analyzer"; | ||
187 | 189 | ||
188 | let binaryName: string | undefined = undefined; | 190 | let binaryName: string | undefined = undefined; |
189 | if (process.arch === "x64" || process.arch === "x32") { | 191 | if (process.arch === "x64" || process.arch === "x32") { |