aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src/main.ts
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-03-20 11:50:50 +0000
committerAleksey Kladov <[email protected]>2020-03-20 12:07:12 +0000
commit4b5435b52bdcb54eea18c80f952cfc3a72975e70 (patch)
treead911289cd4e28036f7a8442422f05a2b97d3268 /editors/code/src/main.ts
parent467a040509cd6732de48907e025f83b57b5701b9 (diff)
Make from-source install use cargo installed binary by default
Diffstat (limited to 'editors/code/src/main.ts')
-rw-r--r--editors/code/src/main.ts2
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
112async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> { 112async 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") {