Merge pull request #156 from aspeddro/relax-async-await-rule

fix: allow `async` as valid identifier

Author: nkrkv

grammar.js

@@ -107,6 +107,7 @@ module.exports = grammar({
     [$.variant_declaration],
     [$.unit, $._function_type_parameter_list],
     [$.functor_parameter, $.module_primary_expression, $.module_identifier_path],
+    [$._reserved_identifier, $.function]
   ],
 
   rules: {
@@ -1358,6 +1359,7 @@ module.exports = grammar({
 
     value_identifier: $ => choice(
       /[a-z_][a-zA-Z0-9_']*/,
+      $._reserved_identifier,
       $._escape_identifier,
     ),
 
@@ -1488,6 +1490,10 @@ module.exports = grammar({
     lparen: $ => alias($._lparen, '('),
     rparen: $ => alias($._rparen, ')'),
     uncurry: $ => '.',
+
+    _reserved_identifier: $ => choice(
+      'async'
+    )
   },
 });
 

queries/highlights.scm

@@ -112,13 +112,14 @@
   "type"
   "and"
   "assert"
-  "async"
   "await"
   "with"
   "unpack"
   "lazy"
 ] @keyword
 
+((function "async" @keyword))
+
 [
   "if"
   "else"

test/corpus/functions.txt

@@ -12,6 +12,7 @@ a => 1
 (h, trailing,) => 5
 (set, kv) => 2
 (a, .b, c, .d) => 7
+(async) => 1
 
 ---
 
@@ -53,7 +54,12 @@ a => 1
       (parameter
         (uncurry)
         (value_identifier)))
-    (number))))
+    (number)))
+  (expression_statement
+    (function
+      (formal_parameters
+        (parameter (value_identifier)))
+      (number))))
 
 ===================================================
 Type annotations

test/corpus/let_bindings.txt

@@ -7,6 +7,7 @@ let b = a
 let c = #foo
 let list = 1
 let a = list
+let async = 1
 export d = 5
 
 ---
@@ -17,6 +18,7 @@ export d = 5
   (let_binding (value_identifier) (polyvar (polyvar_identifier)))
   (let_binding (value_identifier) (number))
   (let_binding (value_identifier) (value_identifier))
+  (let_binding (value_identifier) (number))
   (let_binding (value_identifier) (number)))
 
 ============================================

test/highlight/functions.res

@@ -5,3 +5,6 @@ let inc = n => n + 1
 let uncurry = (. u, .x) => (u, x)
 //             ^ operator
 //                  ^ operator
+
+let get = async (id) => id
+//         ^ keyword