3 files changed, 15 insertions, 5 deletions

diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 2b8012bdd..0fd1d13e6 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -68,7 +68,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "as", "async", "await", "box", "break", "const", "continue", "crate", "dyn", "else",
         "enum", "extern", "false", "fn", "for", "if", "impl", "in", "let", "loop", "macro",
         "match", "mod", "move", "mut", "pub", "ref", "return", "self", "static", "struct", "super",
-        "trait", "true", "try", "type", "unsafe", "use", "where", "while",
+        "trait", "true", "try", "type", "unsafe", "use", "where", "while", "yield",
     ],
     contextual_keywords: &["auto", "default", "existential", "union", "raw", "macro_rules"],
     literals: &["INT_NUMBER", "FLOAT_NUMBER", "CHAR", "BYTE", "STRING", "BYTE_STRING"],
@@ -104,6 +104,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "MACRO_DEF",
         "PAREN_TYPE",
         "TUPLE_TYPE",
+        "MACRO_TYPE",
         "NEVER_TYPE",
         "PATH_TYPE",
         "PTR_TYPE",
@@ -149,6 +150,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "LABEL",
         "BLOCK_EXPR",
         "RETURN_EXPR",
+        "YIELD_EXPR",
         "MATCH_EXPR",
         "MATCH_ARM_LIST",
         "MATCH_ARM",
diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs
index be218dea1..6e18a50a6 100644
--- a/xtask/src/codegen/gen_assists_docs.rs
+++ b/xtask/src/codegen/gen_assists_docs.rs
@@ -86,8 +86,8 @@ impl Assist {
 
 impl fmt::Display for Assist {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let before = self.before.replace("<|>", "┃"); // Unicode pseudo-graphics bar
-        let after = self.after.replace("<|>", "┃");
+        let before = self.before.replace("$0", "┃"); // Unicode pseudo-graphics bar
+        let after = self.after.replace("$0", "┃");
         writeln!(
             f,
             "[discrete]\n=== `{}`
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 3e07daae9..dec48629c 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -12,7 +12,7 @@ use std::env;
 
 use codegen::CodegenCmd;
 use pico_args::Arguments;
-use xshell::pushd;
+use xshell::{cmd, cp, pushd};
 use xtask::{
     codegen::{self, Mode},
     dist::DistCmd,
@@ -124,6 +124,13 @@ FLAGS:
             args.finish()?;
             MetricsCmd { dry_run }.run()
         }
+        "bb" => {
+            let suffix: String = args.free_from_str()?.unwrap();
+            args.finish()?;
+            cmd!("cargo build --release").run()?;
+            cp("./target/release/rust-analyzer", format!("./target/rust-analyzer-{}", suffix))?;
+            Ok(())
+        }
         _ => {
             eprintln!(
                 "\
@@ -141,7 +148,8 @@ SUBCOMMANDS:
     install
     lint
     dist
-    promote"
+    promote
+    bb"
             );
             Ok(())
         }