3 files changed, 24 insertions, 6 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 5c056463e..a7a1829dd 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "rust-analyzer",
-    "version": "0.1.0",
+    "version": "0.2.0-dev",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index f687eb8d4..2b8e5aec5 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -5,7 +5,8 @@
     "preview": true,
     "private": true,
     "icon": "icon.png",
-    "version": "0.1.0",
+    "//": "The real version is in release.yaml, this one just needs to be bigger",
+    "version": "0.2.0-dev",
     "publisher": "matklad",
     "repository": {
         "url": "https://github.com/rust-analyzer/rust-analyzer.git",
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index a279598b9..9bddc8d7f 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -1,8 +1,9 @@
 //! Installs rust-analyzer language server and/or editor plugin.
 
-use std::{env, path::PathBuf, str};
+use std::{env, fs, path::PathBuf, str};
 
 use anyhow::{bail, format_err, Context, Result};
+use walkdir::WalkDir;
 
 use crate::cmd::{run, run_with_output, Cmd};
 
@@ -95,6 +96,20 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
 
     Cmd { unix: r"npm install", windows: r"cmd.exe /c npm install", work_dir: "./editors/code" }
         .run()?;
+
+    let vsixes = || {
+        WalkDir::new("./editors/code")
+            .max_depth(1)
+            .into_iter()
+            .map(|it| it.unwrap())
+            .map(|it| it.path().to_owned())
+            .filter(|it| it.file_name().unwrap_or_default().to_string_lossy().ends_with(".vsix"))
+    };
+
+    for path in vsixes() {
+        fs::remove_file(path)?
+    }
+
     Cmd {
         unix: r"npm run package --scripts-prepend-node-path",
         windows: r"cmd.exe /c npm run package",
@@ -102,6 +117,8 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     }
     .run()?;
 
+    let extension = vsixes().next().unwrap().file_name().unwrap().to_string_lossy().to_string();
+
     let code_binary = ["code", "code-insiders", "codium", "code-oss"]
         .iter()
         .find(|bin| {
@@ -118,10 +135,10 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
         })?;
 
     Cmd {
-        unix: &format!(r"{} --install-extension ./rust-analyzer-0.1.0.vsix --force", code_binary),
+        unix: &format!(r"{} --install-extension ./{} --force", code_binary, extension),
         windows: &format!(
-            r"cmd.exe /c {}.cmd --install-extension ./rust-analyzer-0.1.0.vsix --force",
-            code_binary
+            r"cmd.exe /c {}.cmd --install-extension ./{} --force",
+            code_binary, extension
         ),
         work_dir: "./editors/code",
     }