fix!: rename experession_statement to expression_statement

tree-sitter-grammars · Feb 19, 2024 · d6ec8ce · d6ec8ce
1 parent 3d6dfbd
commit d6ec8ce
Show file tree

Hide file tree

Showing 11 changed files with 2,066 additions and 2,097 deletions.
diff --git a/corpus/basetypes.txt b/corpus/basetypes.txt
@@ -14,15 +14,15 @@ beta = '@a@\'\"\@'
         (escape_sequence)
         (escape_sequence)))))
 ======================
-variabe with commands 
+variable with commands
 ======================
 libpam = cc.find_library('pam', required: get_option('pam'))
 ---
 (source_file
   (operatorunit
     (identifier)
     (variableunit
-      (experession_statement
+      (expression_statement
         (identifier)
         (normal_command
           (identifier)
@@ -99,7 +99,7 @@ command = [
       (identifier)
       (string)
       (variableunit
-        (experession_statement
+        (expression_statement
           (string
             (formatunit
               (number))
@@ -110,7 +110,7 @@ command = [
           (normal_command
             (identifier)
             (variableunit
-              (experession_statement
+              (expression_statement
                 (identifier)
                 (normal_command
                   (identifier))))

diff --git a/corpus/commands.txt b/corpus/commands.txt
@@ -17,7 +17,7 @@ vncornot = isitvnc.disabled()
   (comment)
   (operatorunit
     (identifier)
-    (experession_statement
+    (expression_statement
       (normal_command
         (identifier)
         (variableunit
@@ -32,13 +32,13 @@ vncornot = isitvnc.disabled()
         (string))))
   (operatorunit
     (identifier)
-    (experession_statement
+    (expression_statement
       (identifier)
       (identifier)))
   (operatorunit
     (identifier)
       (variableunit
-        (experession_statement
+        (expression_statement
           (identifier)
           (normal_command
             (identifier))))))
@@ -73,7 +73,7 @@ custom_target(
       (list
         (identifier)
         (string)
-        (experession_statement
+        (expression_statement
           (string
             (formatunit
               (number))
@@ -84,7 +84,7 @@ custom_target(
           (normal_command
             (identifier)
             (variableunit
-              (experession_statement
+              (expression_statement
                 (identifier)
                 (normal_command
                   (identifier))))
@@ -95,7 +95,7 @@ custom_target(
       (bool))
     (pair
       (identifier)
-      (experession_statement
+      (expression_statement
         (string
           (formatunit
             (number)))

diff --git a/corpus/ifelse.txt b/corpus/ifelse.txt
@@ -26,7 +26,7 @@ endif
   (if_condition
     (if_command
       (var_unit
-        (experession_statement
+        (expression_statement
           (identifier)
           (normal_command
             (identifier))))
@@ -54,7 +54,7 @@ endif
   (if_condition
     (if_command
       (var_unit
-        (experession_statement
+        (expression_statement
           (identifier)
           (normal_command
             (identifier))))
@@ -67,10 +67,10 @@ endif
         (identifier)))
     (elseif_command
       (var_unit
-        (experession_statement
+        (expression_statement
           (identifier)
           (identifier))
-        (experession_statement
+        (expression_statement
           (identifier)
           (identifier))))
     (else_command
@@ -92,21 +92,21 @@ endif
   (if_condition
     (if_command
       (var_unit
-        (experession_statement
+        (expression_statement
           (identifier)
           (normal_command
             (identifier)
             (variableunit
               (string)))))
-      (experession_statement
+      (expression_statement
         (identifier)
         (normal_command
           (identifier)
           (variableunit
             (string))
           (var_unit
             (bool))))
-      (experession_statement
+      (expression_statement
         (identifier)
         (normal_command
           (identifier)
@@ -116,7 +116,7 @@ endif
             (bool)))))
     (elseif_command
       (var_unit
-        (experession_statement
+        (expression_statement
           (identifier)
           (normal_command
             (identifier)
@@ -125,7 +125,7 @@ endif
             (pair
               (identifier)
               (string)))))
-      (experession_statement
+      (expression_statement
         (identifier)
         (normal_command
           (identifier)
@@ -202,10 +202,10 @@ endif
     (if_command
       (var_unit
         (var_unit
-          (experession_statement
+          (expression_statement
             (identifier)
             (identifier))
-          (experession_statement
+          (expression_statement
             (identifier)
             (normal_command
               (identifier)))))

diff --git a/grammar.js b/grammar.js
@@ -11,17 +11,17 @@ module.exports = grammar({
     [$.normal_command, $.operatorunit],
     [$.variableunit, $.operatorunit],
     [$.variableunit, $.pair],
-    [$.experession_statement],
+    [$.expression_statement],
     [$.variableunit],
     [$.pair, $.variableunit, $._logic_unit],
     [$.operatorunit, $.variableunit, $._logic_unit],
     [$.normal_command, $.variableunit, $._logic_unit],
     [$.pair, $._logic_unit],
-    [$.listitem, $.experession_statement],
+    [$.listitem, $.expression_statement],
     [$.list, $.variableunit],
     [$.listitem, $.variableunit],
     [$.listitem, $._logic_unit],
-    [$.normal_command, $.experession_statement],
+    [$.normal_command, $.expression_statement],
     [$._logic_unit],
     [$.var_unit],
     [$.normal_command, $.pair, $.variableunit, $._logic_unit],
@@ -34,7 +34,7 @@ module.exports = grammar({
     _unit: ($) =>
       seq(
         choice(
-          $.experession_statement,
+          $.expression_statement,
           $.comment,
           $.normal_command,
           $.operatorunit,

diff --git a/grammar/base.js b/grammar/base.js
@@ -23,7 +23,7 @@ module.exports = {
                 $.normal_command,
                 $.listitem,
                 $.list,
-                $.experession_statement,
+                $.expression_statement,
                 $.pair,
                 $.variableunit,
                 $.var_unit
@@ -36,7 +36,7 @@ module.exports = {
             $.normal_command,
             $.listitem,
             $.list,
-            $.experession_statement,
+            $.expression_statement,
             $.pair,
             $.variableunit,
             $.var_unit
@@ -133,7 +133,7 @@ module.exports = {
                 $.bool,
                 $.variableunit,
                 field("variable", $.identifier),
-                field("variable", $.experession_statement)
+                field("variable", $.expression_statement)
               ),
               ","
             )
@@ -147,7 +147,7 @@ module.exports = {
               $.bool,
               $.variableunit,
               field("variable", $.identifier),
-              field("variable", $.experession_statement)
+              field("variable", $.expression_statement)
             )
           )
         )
@@ -184,7 +184,7 @@ module.exports = {
           $.identifier,
           $.list,
           $.string,
-          $.experession_statement
+          $.expression_statement
         )
       )
     ),

diff --git a/grammar/operation.js b/grammar/operation.js
@@ -14,7 +14,7 @@ module.exports = {
         $.bool,
         $.normal_command,
         $.number,
-        $.experession_statement,
+        $.expression_statement,
         $.ternaryoperator,
         $.var_unit
         //field("value", $.identifier),
@@ -27,7 +27,7 @@ module.exports = {
         $.normal_command,
         $.string,
         $.list,
-        $.experession_statement,
+        $.expression_statement,
         field("value", $.identifier)
       ),
       optional(
@@ -38,7 +38,7 @@ module.exports = {
               $.normal_command,
               $.list,
               $.string,
-              $.experession_statement,
+              $.expression_statement,
               field("value", $.identifier)
             )
           )
@@ -52,7 +52,7 @@ module.exports = {
       $.bool,
       $.normal_command,
       $.number,
-      $.experession_statement,
+      $.expression_statement,
       $.listitem,
       $.list,
       seq("(", $.var_unit, ")"),
@@ -74,7 +74,7 @@ module.exports = {
       optional("not"),
       $._logic_unit
     ),
-  experession_statement: ($) =>
+  expression_statement: ($) =>
     seq(
       choice(
         field("object", $.identifier),
@@ -88,7 +88,7 @@ module.exports = {
           choice(
             field("function", $.normal_command),
             field("object", $.listitem),
-            field("function", $.experession_statement),
+            field("function", $.expression_statement),
             field("property", $.identifier)
           ),
           optional(field("index", seq("[", $.number, "]")))

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -40,7 +40,7 @@
 (string) @string
 ["@"] @keyword
 
-(experession_statement
+(expression_statement
 	object: (identifier) @variable)
 (normal_command
 	command: (identifier) @function)