Sync with winglang/wing

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-wing"
 description = "Wing grammar for tree-sitter"
-version = "0.83.11"
+version = "0.85.49"
 license = "MIT"
 readme = "README.md"
 keywords = ["incremental", "parsing", "tree-sitter", "wing"]

grammar.js

@@ -41,7 +41,6 @@ module.exports = grammar({
 
     // These modifier conflicts should be solved through GLR parsing
     [$.field_modifiers, $.method_modifiers],
-    [$.class_modifiers, $.closure_modifiers, $.interface_modifiers],
   ],
 
   supertypes: ($) => [$.expression, $._literal],
@@ -378,7 +377,8 @@ module.exports = grammar({
         $.json_literal,
         $.struct_literal,
         $.optional_unwrap,
-        $.intrinsic
+        $.intrinsic,
+        $.type_intrinsic,
       ),
 
     intrinsic: ($) =>
@@ -390,6 +390,15 @@ module.exports = grammar({
       ),
     intrinsic_identifier: ($) => /@[A-Za-z_$0-9]*/,
 
+    // TODO: is there some way to generalize this
+    // so we can define other intrinsics or functions that accept types?
+    type_intrinsic: ($) => seq(
+      "@type",
+      "(",
+      field("type", $._type),
+      ")"
+    ),
+
     // Primitives
     _literal: ($) =>
       choice(
@@ -539,7 +548,8 @@ module.exports = grammar({
         "void",
         "duration",
         "datetime",
-        "regex"
+        "regex",
+        "bytes"
       ),
 
     initializer: ($) =>
@@ -671,7 +681,7 @@ module.exports = grammar({
       );
     },
 
-    closure_modifiers: ($) => repeat1(choice($.phase_specifier)),
+    closure_modifiers: ($) => choice($.phase_specifier),
 
     closure: ($) =>
       seq(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winglang/tree-sitter-wing",
-  "version": "0.83.11",
+  "version": "0.85.49",
   "description": "winglang grammar for tree-sitter",
   "main": "bindings/node",
   "types": "bindings/node",

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-wing"
 description = "Wing grammar for tree-sitter"
-version = "0.83.11"
+version = "0.85.49"
 keywords = ["incremental", "parsing", "tree-sitter", "wing"]
 classifiers = [
   "Intended Audience :: Developers",