3 files changed, 26 insertions, 10 deletions

diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index 19fea67d8..db05dcebb 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -1,4 +1,4 @@
-//! This module generate AST datatype used by rust-analyzer.
+//! This module generates AST datatype used by rust-analyzer.
 //!
 //! Specifically, it generates the `SyntaxKind` enum and a number of newtype
 //! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`.
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index fa82633de..bffd91af1 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -107,29 +107,44 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     };
 
     Cmd {
-        unix: &format!(r"{} --install-extension ./ra-lsp-0.0.1.vsix --force", code_binary),
+        unix: &format!(r"{} --install-extension ./rust-analyzer-0.1.0.vsix --force", code_binary),
         windows: &format!(
-            r"cmd.exe /c {}.cmd --install-extension ./ra-lsp-0.0.1.vsix --force",
+            r"cmd.exe /c {}.cmd --install-extension ./rust-analyzer-0.1.0.vsix --force",
             code_binary
         ),
         work_dir: "./editors/code",
     }
     .run()?;
 
-    let output = Cmd {
-        unix: &format!(r"{} --list-extensions", code_binary),
-        windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
-        work_dir: ".",
-    }
-    .run_with_output()?;
+    let installed_extensions = {
+        let output = Cmd {
+            unix: &format!(r"{} --list-extensions", code_binary),
+            windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
+            work_dir: ".",
+        }
+        .run_with_output()?;
+        String::from_utf8(output.stdout)?
+    };
 
-    if !str::from_utf8(&output.stdout)?.contains("ra-lsp") {
+    if !installed_extensions.contains("rust-analyzer") {
         anyhow::bail!(
             "Could not install the Visual Studio Code extension. \
              Please make sure you have at least NodeJS 10.x together with the latest version of VS Code installed and try again."
         );
     }
 
+    if installed_extensions.contains("ra-lsp") {
+        Cmd {
+            unix: &format!(r"{} --uninstall-extension matklad.ra-lsp", code_binary),
+            windows: &format!(
+                r"cmd.exe /c {}.cmd --uninstall-extension matklad.ra-lsp",
+                code_binary
+            ),
+            work_dir: "./editors/code",
+        }
+        .run()?;
+    }
+
     Ok(())
 }
 
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 0a569cf5d..9b0afe8e0 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -53,6 +53,7 @@ fn reformat(text: impl std::fmt::Display) -> Result<String> {
     write!(rustfmt.stdin.take().unwrap(), "{}", text)?;
     let output = rustfmt.wait_with_output()?;
     let stdout = String::from_utf8(output.stdout)?;
+    // TODO: update the preable: replace ra_tools with the relevant path
     let preamble = "Generated file, do not edit by hand, see `crate/ra_tools/src/codegen`";
     Ok(format!("//! {}\n\n{}", preamble, stdout))
 }