1 files changed, 21 insertions, 15 deletions

diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index 8c65b51e3..99e1eddb1 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -24,6 +24,7 @@ pub struct ServerOpt {
 
 impl InstallCmd {
     pub fn run(self) -> Result<()> {
+        let both = self.server.is_some() && self.client.is_some();
         if cfg!(target_os = "macos") {
             fix_path_for_mac().context("Fix path for mac")?
         }
@@ -33,6 +34,16 @@ impl InstallCmd {
         if let Some(client) = self.client {
             install_client(client).context("install client")?;
         }
+        if both {
+            eprintln!(
+                "
+    Installation complete.
+
+    Add `\"rust-analyzer.raLspServerPath\": \"ra_lsp_server\",` to VS Code settings,
+    otherwise it will use the latest release from GitHub.
+"
+            )
+        }
         Ok(())
     }
 }
@@ -116,15 +127,12 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     }
     .run()?;
 
-    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)?
-    };
+    let installed_extensions = Cmd {
+        unix: &format!(r"{} --list-extensions", code_binary),
+        windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
+        work_dir: ".",
+    }
+    .run_with_output()?;
 
     if !installed_extensions.contains("rust-analyzer") {
         anyhow::bail!(
@@ -150,12 +158,10 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
 
 fn install_server(opts: ServerOpt) -> Result<()> {
     let mut old_rust = false;
-    if let Ok(output) = run_with_output("cargo --version", ".") {
-        if let Ok(stdout) = String::from_utf8(output.stdout) {
-            println!("{}", stdout);
-            if !check_version(&stdout, REQUIRED_RUST_VERSION) {
-                old_rust = true;
-            }
+    if let Ok(stdout) = run_with_output("cargo --version", ".") {
+        println!("{}", stdout);
+        if !check_version(&stdout, REQUIRED_RUST_VERSION) {
+            old_rust = true;
         }
     }