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]>

4 files changed, 9 insertions, 7 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index d5eb3d016..b7220d8e2 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1762,9 +1762,9 @@
             "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
         },
         "vscode-languageclient": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.1.tgz",
-            "integrity": "sha512-mB6d8Tg+82l8EFUfR+SBu0+lCshyKVgC5E5+MQ0/BJa+9AgeBjtG5npoGaCo4/VvWzK0ZRGm85zU5iRp1RYPIA==",
+            "version": "6.1.3",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz",
+            "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==",
             "requires": {
                 "semver": "^6.3.0",
                 "vscode-languageserver-protocol": "^3.15.3"
diff --git a/editors/code/package.json b/editors/code/package.json
index 2cb48abb7..eb5748515 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -6,7 +6,7 @@
     "private": true,
     "icon": "icon.png",
     "version": "0.4.0-dev",
-    "releaseTag": "nightly",
+    "releaseTag": null,
     "publisher": "matklad",
     "repository": {
         "url": "https://github.com/rust-analyzer/rust-analyzer.git",
@@ -34,7 +34,7 @@
     "dependencies": {
         "jsonc-parser": "^2.2.1",
         "node-fetch": "^2.6.0",
-        "vscode-languageclient": "=6.1.1"
+        "vscode-languageclient": "6.1.3"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^11.0.2",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 54b905303..be5296fcf 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -44,11 +44,11 @@ export class Config {
         .packageJSON
         .version;
 
-    readonly releaseTag: string = vscode
+    readonly releaseTag: string | undefined = vscode
         .extensions
         .getExtension(this.extensionId)!
         .packageJSON
-        .releaseTag;
+        .releaseTag ?? undefined;
 
     private cfg!: vscode.WorkspaceConfiguration;
 
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
 }
 
 async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> {
+    if (config.releaseTag === undefined) return;
     if (config.channel === "stable") {
         if (config.releaseTag === NIGHTLY_TAG) {
             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
         }
         return explicitPath;
     };
+    if (config.releaseTag === undefined) return "rust-analyzer";
 
     let binaryName: string | undefined = undefined;
     if (process.arch === "x64" || process.arch === "x32") {