Fix aliasing (#54)

Add an alias from `when_condition_call_expression` to `call_expression`

Author: afroozeh

grammar.js

@@ -1129,7 +1129,7 @@ module.exports = grammar({
     ),
 
     _when_condition_primary_expression: $ => choice(
-      $.when_condition_call_expression,
+      alias($.when_condition_call_expression, $.call_expression),
       $._non_call_primary_expression
     ),
 

src/grammar.json

@@ -5748,8 +5748,13 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "when_condition_call_expression"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "when_condition_call_expression"
+          },
+          "named": true,
+          "value": "call_expression"
         },
         {
           "type": "SYMBOL",

src/node-types.json

@@ -243,6 +243,10 @@
         "type": "boolean_literal",
         "named": true
       },
+      {
+        "type": "call_expression",
+        "named": true
+      },
       {
         "type": "callable_reference",
         "named": true
@@ -387,10 +391,6 @@
         "type": "unsigned_literal",
         "named": true
       },
-      {
-        "type": "when_condition_call_expression",
-        "named": true
-      },
       {
         "type": "when_expression",
         "named": true
@@ -3843,52 +3843,6 @@
       ]
     }
   },
-  {
-    "type": "when_condition_call_expression",
-    "named": true,
-    "fields": {
-      "args": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "value_arguments",
-            "named": true
-          }
-        ]
-      },
-      "expression": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "expression",
-            "named": true
-          }
-        ]
-      },
-      "lambda_arg": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "annotated_lambda",
-            "named": true
-          }
-        ]
-      }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "type_arguments",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "when_entries",
     "named": true,

src/parser.c

@@ -666,7 +666,7 @@ static const char * const ts_symbol_names[] = {
   [sym_postfix_expression] = "postfix_expression",
   [sym_dot_qualified_expression] = "dot_qualified_expression",
   [sym_call_expression] = "call_expression",
-  [sym_when_condition_call_expression] = "when_condition_call_expression",
+  [sym_when_condition_call_expression] = "call_expression",
   [sym_simple_call_expression] = "call_expression",
   [sym__call_arguments] = "_call_arguments",
   [sym_index_access_expression] = "index_access_expression",
@@ -1065,7 +1065,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_postfix_expression] = sym_postfix_expression,
   [sym_dot_qualified_expression] = sym_dot_qualified_expression,
   [sym_call_expression] = sym_call_expression,
-  [sym_when_condition_call_expression] = sym_when_condition_call_expression,
+  [sym_when_condition_call_expression] = sym_call_expression,
   [sym_simple_call_expression] = sym_call_expression,
   [sym__call_arguments] = sym__call_arguments,
   [sym_index_access_expression] = sym_index_access_expression,
@@ -33976,7 +33976,7 @@ static const TSSymbol ts_supertype_symbols[SUPERTYPE_COUNT] = {
 static const TSMapSlice ts_supertype_map_slices[] = {
   [sym_expression] = {.index = 0, .length = 46},
   [sym_jump_expression] = {.index = 46, .length = 4},
-  [sym_when_condition_expression] = {.index = 50, .length = 46},
+  [sym_when_condition_expression] = {.index = 50, .length = 48},
 };
 
 static const TSSymbol ts_supertype_map_entries[] = {
@@ -34040,6 +34040,7 @@ static const TSSymbol ts_supertype_map_entries[] = {
     sym_assignment,
     sym_bin_literal,
     sym_boolean_literal,
+    sym_call_expression,
     sym_callable_reference,
     sym_character_literal,
     sym_collection_literal,
@@ -34070,6 +34071,7 @@ static const TSSymbol ts_supertype_map_entries[] = {
     sym_prefix_expression,
     sym_range_expression,
     sym_real_literal,
+    sym_simple_call_expression,
     sym_simple_identifier,
     sym_string_literal,
     sym_super_expression,

test/corpus/newlines.txt

@@ -1609,7 +1609,7 @@ when {
       entries: (when_entries
         (when_entry
           condition: (when_condition
-            (when_condition_call_expression
+            (call_expression
               expression: (simple_identifier)
               args: (value_arguments)))
           body: (boolean_literal))))))