Merge pull request #151 from aspeddro/support-lazy

support lazy

Author: nkrkv

grammar.js

@@ -40,6 +40,7 @@ module.exports = grammar({
       $.spread_element,
       $.await_expression,
       $.pipe_expression,
+      $.lazy_expression,
       'binary_times',
       'binary_pow',
       'binary_plus',
@@ -72,6 +73,7 @@ module.exports = grammar({
     [$.primary_expression, $.record_pattern],
     [$.primary_expression, $.spread_pattern],
     [$.primary_expression, $._literal_pattern],
+    [$.primary_expression, $.lazy_pattern],
     [$.primary_expression, $._jsx_child],
     [$.tuple_pattern, $.parameter],
     [$.primary_expression, $.parameter],
@@ -438,7 +440,7 @@ module.exports = grammar({
     ),
 
     _let_binding: $ => seq(
-      $._binding_pattern,
+      $._pattern,
       optional($.type_annotation),
       optional(seq(
         '=',
@@ -457,16 +459,6 @@ module.exports = grammar({
       $._let_binding,
     ),
 
-    _binding_pattern: $ => choice(
-      $.value_identifier,
-      $.tuple_pattern,
-      $.record_pattern,
-      $.array_pattern,
-      $.list_pattern,
-      $.module_unpack_pattern,
-      $.unit
-    ),
-
     expression_statement: $ => $.expression,
 
     expression: $ => choice(
@@ -513,6 +505,7 @@ module.exports = grammar({
       $.member_expression,
       $.module_pack,
       $.extension_expression,
+      $.lazy_expression,
     ),
 
     parenthesized_expression: $ => seq(
@@ -838,6 +831,7 @@ module.exports = grammar({
         $.polyvar_type_pattern,
         $.unit,
         $.module_pack,
+        $.lazy_pattern,
         $._parenthesized_pattern,
       )),
       optional($.type_annotation),
@@ -931,8 +925,15 @@ module.exports = grammar({
       choice($.value_identifier, $.list_pattern, $.array_pattern),
     ),
 
-    module_unpack_pattern: $ => seq(
-      'module', '(', $.module_identifier, ')',
+    lazy_pattern: $ => seq(
+      'lazy',
+      choice(
+        $.value_identifier,
+        $._literal_pattern,
+        $._destructuring_pattern,
+        $.polyvar_type_pattern,
+        $._parenthesized_pattern,
+      )
     ),
 
     _jsx_element: $ => choice($.jsx_element, $.jsx_self_closing_element),
@@ -1093,6 +1094,11 @@ module.exports = grammar({
       $.block,
     ),
 
+    lazy_expression: $ =>  seq(
+      'lazy',
+      $.expression,
+    ),
+
     binary_expression: $ => choice(
       ...[
         ['&&', 'binary_and'],

queries/highlights.scm

@@ -116,6 +116,7 @@
   "await"
   "with"
   "unpack"
+  "lazy"
 ] @keyword
 
 [

test/corpus/expressions.txt

@@ -1408,3 +1408,22 @@ let f = ({name, _} as foo: T.t) => {}
                 (module_identifier)
                 (type_identifier))))))
       body: (block))))
+
+===========================================
+Lazy Expression
+===========================================
+
+lazy { 1 }
+lazy call()
+
+---
+
+(source_file
+  (expression_statement
+    (lazy_expression
+      (block
+        (expression_statement (number)))))
+  (expression_statement
+    (lazy_expression
+      (call_expression
+        (value_identifier) (arguments)))))

test/corpus/let_bindings.txt

@@ -328,5 +328,19 @@ let module(Bar) = foo
 
 (source_file
   (let_binding
-    (module_unpack_pattern (module_identifier))
+    (module_pack (module_identifier))
     (value_identifier)))
+
+===========================================
+Lazy Values
+===========================================
+
+let lazy x = lazy(1)
+
+---
+
+(source_file
+  (let_binding
+    (lazy_pattern (value_identifier))
+    (lazy_expression
+      (parenthesized_expression (number)))))