Merge #1138

1138: Add L_DOLLAR and R_DOLLAR r=matklad a=edwin0cheng

As discussion in issue https://github.com/rust-analyzer/rust-analyzer/issues/1132 and PR #1125 , this PR add 2 `Syntax::Kind` : `L_DOLLAR` and `R_DOLLAR` for representing `Delimiter::None` in mbe and proc_marco. By design, It should not affect the final syntax tree, and will be discard in `TreeSink`.

My original idea is handling these 2 tokens case by case, but i found that they will appear in every place in the parser (imagine `tt` matcher). So this PR only handle it in `Parser::do_bump` and `Parser::start`, although It will not fix the `expr` matcher executing order problem in original idea.


Co-authored-by: Edwin Cheng <[email protected]>

1 files changed, 4 insertions, 0 deletions

diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index b8350266f..498b0e164 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -120,6 +120,8 @@ pub enum SyntaxKind {
     LIFETIME,
     COMMENT,
     SHEBANG,
+    L_DOLLAR,
+    R_DOLLAR,
     SOURCE_FILE,
     STRUCT_DEF,
     ENUM_DEF,
@@ -477,6 +479,8 @@ impl SyntaxKind {
             LIFETIME => &SyntaxInfo { name: "LIFETIME" },
             COMMENT => &SyntaxInfo { name: "COMMENT" },
             SHEBANG => &SyntaxInfo { name: "SHEBANG" },
+            L_DOLLAR => &SyntaxInfo { name: "L_DOLLAR" },
+            R_DOLLAR => &SyntaxInfo { name: "R_DOLLAR" },
             SOURCE_FILE => &SyntaxInfo { name: "SOURCE_FILE" },
             STRUCT_DEF => &SyntaxInfo { name: "STRUCT_DEF" },
             ENUM_DEF => &SyntaxInfo { name: "ENUM_DEF" },