aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-20 10:00:35 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-20 10:00:35 +0100
commit2830d1376b05794c7bf1467fe52ad3bc0eb4ca41 (patch)
tree7a717bb2a51489b4e1bc50895bff45f1e217f15c /crates/ra_syntax/src
parente18f8495d6569f4fc0b7457b65a1d199cf7b5974 (diff)
parent3a7f07c62d3dd253d63c483ee291d9471f539479 (diff)
Merge #1558
1558: Support .await syntax r=matklad a=unrealhoang - [x] Add `await` keyword to grammar, parser for await_expr - [ ] Infer type for await_expr Co-authored-by: Unreal Hoang <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src')
-rw-r--r--crates/ra_syntax/src/grammar.ron2
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 6c075a700..55494239e 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -97,6 +97,7 @@ Grammar(
97 "return", 97 "return",
98 "try", 98 "try",
99 "box", 99 "box",
100 "await"
100 ], 101 ],
101 contextual_keywords: [ 102 contextual_keywords: [
102 "auto", 103 "auto",
@@ -200,6 +201,7 @@ Grammar(
200 "INDEX_EXPR", 201 "INDEX_EXPR",
201 "METHOD_CALL_EXPR", 202 "METHOD_CALL_EXPR",
202 "FIELD_EXPR", 203 "FIELD_EXPR",
204 "AWAIT_EXPR",
203 "TRY_EXPR", 205 "TRY_EXPR",
204 "CAST_EXPR", 206 "CAST_EXPR",
205 207