feat: destructuring statement

editor_queries/helix/highlights.scm

@@ -6,6 +6,10 @@
 
 (identifier) @variable
 
+(destruct_bind
+  name: (identifier) @comment.line
+  bind: (identifier) @variable)
+
 ; variable.builtin
 ; ----------------
 
@@ -61,14 +65,15 @@
   "/" "/="
   "%" "%="
   "=" "=="
+  "!" "!=" "!!"
   "<" "<=" "<<" "<<="
   ">" ">=" ">>" ">>="
   "&" "&="
   "|" "|="
   "^" "^="
   "&&" "&&="
   "||" "||="
-  "->"
+  "->" ".."
 ] @operator
 
 ; constructor

editor_queries/helix/indents.scm

@@ -10,6 +10,7 @@
 
   ; {..., ...}
   (instance_argument_list)
+  (destruct_bind_list)
 
   ; {...; ...}
   (message_body)

editor_queries/helix/textobjects.scm

@@ -52,6 +52,9 @@
 (instance_argument_list
   ((_) @parameter.inside @parameter.movement . ","? @parameter.around) @parameter.around)
 
+(destruct_bind_list
+  ((_) @parameter.inside @parameter.movement . ","? @parameter.around) @parameter.around)
+
 ; single parameter
 
 (receive_function

editor_queries/neovim/folds.scm

@@ -7,6 +7,7 @@
   (argument_list)
   ; {…, …}
   (instance_argument_list)
+  (destruct_bind_list)
   ; {…; …}
   (message_body)
   (struct_body)

editor_queries/neovim/highlights.scm

@@ -4,6 +4,10 @@
 ; --------
 (identifier) @variable
 
+(destruct_bind
+  name: (identifier) @comment
+  bind: (identifier) @variable)
+
 ; variable.builtin
 ; ----------------
 (self) @variable.builtin
@@ -69,6 +73,7 @@
   "||"
   "||="
   "->"
+  ".."
 ] @operator
 
 ; constructor

editor_queries/neovim/indents.scm

@@ -7,6 +7,7 @@
   (argument_list)
   ; {..., ...}
   (instance_argument_list)
+  (destruct_bind_list)
   ; {...; ...}
   (message_body)
   (struct_body)

editor_queries/neovim/textobjects.scm

@@ -384,6 +384,21 @@
   ","? @_end
   (#make-range! "parameter.outer" @parameter.inner @_end))
 
+; second and following
+(destruct_bind_list
+  "," @_start
+  .
+  (_) @parameter.inner
+  (#make-range! "parameter.outer" @_start @parameter.inner))
+
+; first
+(destruct_bind_list
+  .
+  (_) @parameter.inner
+  .
+  ","? @_end
+  (#make-range! "parameter.outer" @parameter.inner @_end))
+
 ; single parameter
 (receive_function
   parameter: (_) @parameter.inner @parameter.outer)

grammar.js

@@ -32,6 +32,20 @@ function commaSepWithTrailing(rule) {
   return optional(seq(rule, repeat(seq(",", rule)), optional(",")));
 }
 
+/**
+ * Creates a rule to match one or more of the rules separated by a comma with an optional trailing comma or a trailing comma and a .. ("the rest", remaining fields)
+ *
+ * @param {Rule} rule
+ *
+ * @return {ChoiceRule}
+ *
+ */
+function commaSepWithTrailingRest(rule) {
+  return optional(
+    seq(rule, repeat(seq(",", rule)), optional(seq(",", optional("..")))),
+  );
+}
+
 /**
  * Creates a rule to match one or more of the rules separated by a comma
  *
@@ -468,6 +482,7 @@ module.exports = grammar({
         $.assignment_statement, // StatementAssign
         $.augmented_assignment_statement, // StatementAugmentedAssign
         $.do_until_statement, // StatementUntil
+        $.destruct_statement, // StatementDestruct
       ),
 
     let_statement: ($) =>
@@ -479,6 +494,24 @@ module.exports = grammar({
         field("value", $._expression),
       ),
 
+    destruct_statement: ($) =>
+      seq(
+        "let",
+        field("name", alias($._type_identifier, $.type_identifier)),
+        field("binds", $.destruct_bind_list),
+        "=",
+        field("value", $._expression),
+      ),
+
+    destruct_bind_list: ($) =>
+      seq("{", commaSepWithTrailingRest($.destruct_bind), "}"),
+
+    destruct_bind: ($) =>
+      seq(
+        field("name", $.identifier),
+        optional(seq(":", field("bind", $.identifier))),
+      ),
+
     block_statement: ($) =>
       prec.right(
         seq(

queries/highlights.scm

@@ -7,6 +7,10 @@
 
 (identifier) @variable
 
+(destruct_bind
+  name: (identifier) @comment
+  bind: (identifier) @variable)
+
 ; variable.builtin
 ; ----------------
 
@@ -55,7 +59,7 @@
   "^" "^="
   "&&" "&&="
   "||" "||="
-  "->"
+  "->" ".."
 ] @operator
 
 ; constructor
@@ -119,7 +123,7 @@
 
 (storage_constant
     name: (identifier) @constant)
-  
+
 ; constant.builtin
 ; ----------------
 

queries/locals.scm

@@ -29,6 +29,13 @@
 (let_statement
   name: (identifier) @local.definition)
 
+(destruct_bind
+  name: (identifier) @local.definition)
+
+(destruct_bind
+  name: (identifier) @local.definition
+  bind: (identifier) @local.definition)
+
 (parameter
   name: (identifier) @local.definition)