Merge #2628

2628: Add macro 2.0 support in parser r=matklad a=edwin0cheng

This PR added a new syntax kind : `MACRO_DEF` and a keyword `MACRO_KW`

there are two syntax for declarative macro 2.0 :
1. Normal : `macro m { ($i:ident) => {} }` , which handle similar to legacy one. 
2. Call like: `macro m($i:ident) {}`, it produces a single token tree which have two child token trees : `($i:ident)` and `{}`

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

4 files changed, 66 insertions, 0 deletions

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rs b/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rs
new file mode 100644
index 000000000..319a4e2aa
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rs
@@ -0,0 +1,2 @@
+macro m { ($i:ident) => {} }
+macro m($i:ident) {}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.txt b/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.txt
new file mode 100644
index 000000000..af1122bfa
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.txt
@@ -0,0 +1,43 @@
+SOURCE_FILE@[0; 50)
+  MACRO_DEF@[0; 28)
+    MACRO_KW@[0; 5) "macro"
+    WHITESPACE@[5; 6) " "
+    IDENT@[6; 7) "m"
+    WHITESPACE@[7; 8) " "
+    TOKEN_TREE@[8; 28)
+      L_CURLY@[8; 9) "{"
+      WHITESPACE@[9; 10) " "
+      TOKEN_TREE@[10; 20)
+        L_PAREN@[10; 11) "("
+        DOLLAR@[11; 12) "$"
+        IDENT@[12; 13) "i"
+        COLON@[13; 14) ":"
+        IDENT@[14; 19) "ident"
+        R_PAREN@[19; 20) ")"
+      WHITESPACE@[20; 21) " "
+      EQ@[21; 22) "="
+      R_ANGLE@[22; 23) ">"
+      WHITESPACE@[23; 24) " "
+      TOKEN_TREE@[24; 26)
+        L_CURLY@[24; 25) "{"
+        R_CURLY@[25; 26) "}"
+      WHITESPACE@[26; 27) " "
+      R_CURLY@[27; 28) "}"
+  WHITESPACE@[28; 29) "\n"
+  MACRO_DEF@[29; 49)
+    MACRO_KW@[29; 34) "macro"
+    WHITESPACE@[34; 35) " "
+    IDENT@[35; 36) "m"
+    TOKEN_TREE@[36; 49)
+      TOKEN_TREE@[36; 46)
+        L_PAREN@[36; 37) "("
+        DOLLAR@[37; 38) "$"
+        IDENT@[38; 39) "i"
+        COLON@[39; 40) ":"
+        IDENT@[40; 45) "ident"
+        R_PAREN@[45; 46) ")"
+      WHITESPACE@[46; 47) " "
+      TOKEN_TREE@[47; 49)
+        L_CURLY@[47; 48) "{"
+        R_CURLY@[48; 49) "}"
+  WHITESPACE@[49; 50) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs b/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs
new file mode 100644
index 000000000..3b2be597f
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs
@@ -0,0 +1 @@
+pub macro m($:ident) {}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.txt b/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.txt
new file mode 100644
index 000000000..985f61f89
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.txt
@@ -0,0 +1,20 @@
+SOURCE_FILE@[0; 24)
+  MACRO_DEF@[0; 23)
+    VISIBILITY@[0; 3)
+      PUB_KW@[0; 3) "pub"
+    WHITESPACE@[3; 4) " "
+    MACRO_KW@[4; 9) "macro"
+    WHITESPACE@[9; 10) " "
+    IDENT@[10; 11) "m"
+    TOKEN_TREE@[11; 23)
+      TOKEN_TREE@[11; 20)
+        L_PAREN@[11; 12) "("
+        DOLLAR@[12; 13) "$"
+        COLON@[13; 14) ":"
+        IDENT@[14; 19) "ident"
+        R_PAREN@[19; 20) ")"
+      WHITESPACE@[20; 21) " "
+      TOKEN_TREE@[21; 23)
+        L_CURLY@[21; 22) "{"
+        R_CURLY@[22; 23) "}"
+  WHITESPACE@[23; 24) "\n"