feat: object exprresion with generic types

ionide · Sep 8, 2024 · 862fbd8 · 862fbd8
1 parent 9ad957f
commit 862fbd8
Show file tree

Hide file tree

Showing 8 changed files with 883,641 additions and 847,384 deletions.
diff --git a/fsharp/grammar.js b/fsharp/grammar.js
@@ -446,7 +446,6 @@ module.exports = grammar({
         $.infix_expression,
         $.index_expression,
         $.mutate_expression,
-        $.object_instantiation_expression,
         $.list_expression,
         $.array_expression,
         $.ce_expression,
@@ -535,8 +534,8 @@ module.exports = grammar({
       prec(
         PREC.NEW_OBJ + 1,
         seq(
-          $.object_instantiation_expression,
-          optional($._expression),
+          "new",
+          $._expression,
           optional(seq("as", $.identifier)),
           $._object_expression_inner,
         ),
@@ -560,6 +559,7 @@ module.exports = grammar({
           "assert",
           "upcast",
           "downcast",
+          "new",
           $.prefix_op,
         ),
         prec.right(PREC.PREFIX_EXPR, $._expression),
@@ -653,9 +653,6 @@ module.exports = grammar({
         seq("function", scoped($.rules, $._indent, $._dedent)),
       ),
 
-    object_instantiation_expression: ($) =>
-      prec(PREC.NEW_OBJ, seq("new", $._type)),
-
     mutate_expression: ($) =>
       prec.right(
         PREC.LARROW,

diff --git a/fsharp/src/grammar.json b/fsharp/src/grammar.json
@@ -1525,10 +1525,6 @@
           "type": "SYMBOL",
           "name": "mutate_expression"
         },
-        {
-          "type": "SYMBOL",
-          "name": "object_instantiation_expression"
-        },
         {
           "type": "SYMBOL",
           "name": "list_expression"
@@ -1855,20 +1851,12 @@
         "type": "SEQ",
         "members": [
           {
-            "type": "SYMBOL",
-            "name": "object_instantiation_expression"
+            "type": "STRING",
+            "value": "new"
           },
           {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_expression"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
+            "type": "SYMBOL",
+            "name": "_expression"
           },
           {
             "type": "CHOICE",
@@ -1970,6 +1958,10 @@
               "type": "STRING",
               "value": "downcast"
             },
+            {
+              "type": "STRING",
+              "value": "new"
+            },
             {
               "type": "SYMBOL",
               "name": "prefix_op"
@@ -2450,23 +2442,6 @@
         ]
       }
     },
-    "object_instantiation_expression": {
-      "type": "PREC",
-      "value": 24,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "new"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "_type"
-          }
-        ]
-      }
-    },
     "mutate_expression": {
       "type": "PREC_RIGHT",
       "value": 16,

diff --git a/fsharp/src/node-types.json b/fsharp/src/node-types.json
@@ -91,10 +91,6 @@
         "type": "null",
         "named": false
       },
-      {
-        "type": "object_instantiation_expression",
-        "named": true
-      },
       {
         "type": "paren_expression",
         "named": true
@@ -2523,21 +2519,6 @@
       ]
     }
   },
-  {
-    "type": "object_instantiation_expression",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "_type",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "optional_pattern",
     "named": true,