5 files changed, 75 insertions, 21 deletions

diff --git a/xtask/src/cmd.rs b/xtask/src/cmd.rs
index 2027f4893..37497fb74 100644
--- a/xtask/src/cmd.rs
+++ b/xtask/src/cmd.rs
@@ -18,7 +18,7 @@ impl Cmd<'_> {
             run(self.unix, self.work_dir)
         }
     }
-    pub fn run_with_output(self) -> Result<Output> {
+    pub fn run_with_output(self) -> Result<String> {
         if cfg!(windows) {
             run_with_output(self.windows, self.work_dir)
         } else {
@@ -34,8 +34,11 @@ pub fn run(cmdline: &str, dir: &str) -> Result<()> {
     .map(|_| ())
 }
 
-pub fn run_with_output(cmdline: &str, dir: &str) -> Result<Output> {
-    do_run(cmdline, dir, &mut |_| {})
+pub fn run_with_output(cmdline: &str, dir: &str) -> Result<String> {
+    let output = do_run(cmdline, dir, &mut |_| {})?;
+    let stdout = String::from_utf8(output.stdout)?;
+    let stdout = stdout.trim().to_string();
+    Ok(stdout)
 }
 
 fn do_run(cmdline: &str, dir: &str, f: &mut dyn FnMut(&mut Command)) -> Result<Output> {
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;
         }
     }
 
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 8fdf43e4a..1bb1882b0 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -15,7 +15,10 @@ use std::{
     process::{Command, Stdio},
 };
 
-use crate::{cmd::run, codegen::Mode};
+use crate::{
+    cmd::{run, run_with_output},
+    codegen::Mode,
+};
 
 pub use anyhow::Result;
 
@@ -156,3 +159,41 @@ fn rm_rf(path: &Path) -> Result<()> {
     if path.is_file() { fs::remove_file(path) } else { fs::remove_dir_all(path) }
         .with_context(|| format!("failed to remove {:?}", path))
 }
+
+pub fn run_release() -> Result<()> {
+    run("git switch release", ".")?;
+    run("git fetch upstream", ".")?;
+    run("git reset --hard upstream/master", ".")?;
+    run("git push", ".")?;
+
+    let changelog_dir = project_root().join("../rust-analyzer.github.io/thisweek/_posts");
+
+    let today = run_with_output("date --iso", ".")?;
+    let commit = run_with_output("git rev-parse HEAD", ".")?;
+    let changelog_n = fs::read_dir(changelog_dir.as_path())?.count();
+
+    let contents = format!(
+        "\
+= Changelog #{}
+:sectanchors:
+:page-layout: post
+
+Commit: commit:{}[] +
+Release: release:{}[]
+
+== New Features
+
+* pr:[] .
+
+== Fixes
+
+== Internal Improvements
+",
+        changelog_n, commit, today
+    );
+
+    let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n));
+    fs::write(&path, &contents)?;
+
+    Ok(())
+}
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index c347de9ab..7ca727bde 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -14,7 +14,7 @@ use pico_args::Arguments;
 use xtask::{
     codegen::{self, Mode},
     install::{ClientOpt, InstallCmd, ServerOpt},
-    pre_commit, run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result,
+    pre_commit, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt, Result,
 };
 
 fn main() -> Result<()> {
@@ -92,6 +92,10 @@ FLAGS:
             args.finish()?;
             run_pre_cache()
         }
+        "release" => {
+            args.finish()?;
+            run_release()
+        }
         _ => {
             eprintln!(
                 "\
diff --git a/xtask/src/pre_commit.rs b/xtask/src/pre_commit.rs
index 88e868ca6..1533f64dc 100644
--- a/xtask/src/pre_commit.rs
+++ b/xtask/src/pre_commit.rs
@@ -14,7 +14,7 @@ pub fn run_hook() -> Result<()> {
     let diff = run_with_output("git diff --diff-filter=MAR --name-only --cached", ".")?;
 
     let root = project_root();
-    for line in String::from_utf8(diff.stdout)?.lines() {
+    for line in diff.lines() {
         run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?;
     }