update jsx family of languages for preceeding comments and nested exports

crates/zed/src/languages/javascript/embedding.scm

@@ -1,56 +1,83 @@
-; (internal_module
-;     "namespace" @context
-;     name: (_) @name) @item
+(
+    (comment)* @context
+    .
+    (export_statement
+        (function_declaration
+            "async"? @name
+            "function" @name
+            name: (_) @name)) @item
+    )
 
-(enum_declaration
-    "enum" @context
-    name: (_) @name) @item
+(
+    (comment)* @context
+    .
+    (function_declaration
+        "async"? @name
+        "function" @name
+        name: (_) @name) @item
+    )
 
-(function_declaration
-    "async"? @context
-    "function" @context
-    name: (_) @name) @item
+(
+    (comment)* @context
+    .
+    (export_statement
+        (class_declaration
+            "class" @name
+            name: (_) @name)) @item
+    )
 
-(interface_declaration
-    "interface" @context
-    name: (_) @name) @item
+(
+    (comment)* @context
+    .
+    (class_declaration
+        "class" @name
+        name: (_) @name) @item
+    )
 
-; (program
-;     (export_statement
-;         (lexical_declaration
-;             ["let" "const"] @context
-;             (variable_declarator
-;                 name: (_) @name) @item)))
+(
+    (comment)* @context
+    .
+    (method_definition
+        [
+            "get"
+            "set"
+            "async"
+            "*"
+            "static"
+            ]* @name
+        name: (_) @name) @item
+    )
 
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (_) @name) @item))
+(
+    (comment)* @context
+    .
+    (export_statement
+        (interface_declaration
+            "interface" @name
+            name: (_) @name)) @item
+    )
 
-(class_declaration
-    "class" @context
-    name: (_) @name) @item
+(
+    (comment)* @context
+    .
+    (interface_declaration
+        "interface" @name
+        name: (_) @name) @item
+    )
 
-(method_definition
-    [
-        "get"
-        "set"
-        "async"
-        "*"
-        "readonly"
-        "static"
-        (override_modifier)
-        (accessibility_modifier)
-        ]* @context
-    name: (_) @name) @item
+(
+    (comment)* @context
+    .
+    (export_statement
+        (enum_declaration
+            "enum" @name
+            name: (_) @name)) @item
+    )
 
-; (public_field_definition
-;     [
-;         "declare"
-;         "readonly"
-;         "abstract"
-;         "static"
-;         (accessibility_modifier)
-;         ]* @context
-;     name: (_) @name) @item
+(
+    (comment)* @context
+    .
+    (enum_declaration
+        "enum" @name
+        name: (_) @name) @item
+    )

crates/zed/src/languages/tsx/embedding.scm

@@ -1,33 +1,29 @@
 (
     (comment)* @context
     .
-    (enum_declaration
-        "enum" @context
+    (export_statement
+        (function_declaration
+            "async"? @name
+            "function" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (function_declaration
+        "async"? @name
+        "function" @name
         name: (_) @name) @item
     )
 
 (
     (comment)* @context
     .
-    [
-        (export_statement
-            (function_declaration
-                "async"? @name
-                "function" @name
-                name: (_) @name)
-            ) @item
-        (function_declaration
-            "async"? @name
-            "function" @name
-            name: (_) @name) @item
-        ])
-
-(
-    (comment)* @context
-    .
-    (interface_declaration
-        "interface" @name
-        name: (_) @name) @item
+    (export_statement
+        (class_declaration
+            "class" @name
+            name: (_) @name)) @item
     )
 
 (
@@ -47,10 +43,57 @@
             "set"
             "async"
             "*"
-            "readonly"
             "static"
-            (override_modifier)
-            (accessibility_modifier)
             ]* @name
         name: (_) @name) @item
     )
+
+(
+    (comment)* @context
+    .
+    (export_statement
+        (interface_declaration
+            "interface" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (interface_declaration
+        "interface" @name
+        name: (_) @name) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (export_statement
+        (enum_declaration
+            "enum" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (enum_declaration
+        "enum" @name
+        name: (_) @name) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (export_statement
+        (type_alias_declaration
+            "type" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (type_alias_declaration
+        "type" @name
+        name: (_) @name) @item)

crates/zed/src/languages/typescript/embedding.scm

@@ -1,33 +1,29 @@
 (
     (comment)* @context
     .
-    (enum_declaration
-        "enum" @context
+    (export_statement
+        (function_declaration
+            "async"? @name
+            "function" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (function_declaration
+        "async"? @name
+        "function" @name
         name: (_) @name) @item
     )
 
 (
     (comment)* @context
     .
-    [
-        (export_statement
-            (function_declaration
-                "async"? @name
-                "function" @name
-                name: (_) @name)
-            ) @item
-        (function_declaration
-            "async"? @name
-            "function" @name
-            name: (_) @name) @item
-    ])
-
-(
-    (comment)* @context
-    .
-    (interface_declaration
-        "interface" @name
-        name: (_) @name) @item
+    (export_statement
+        (class_declaration
+            "class" @name
+            name: (_) @name)) @item
     )
 
 (
@@ -47,10 +43,57 @@
             "set"
             "async"
             "*"
-            "readonly"
             "static"
-            (override_modifier)
-            (accessibility_modifier)
             ]* @name
         name: (_) @name) @item
     )
+
+(
+    (comment)* @context
+    .
+    (export_statement
+        (interface_declaration
+            "interface" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (interface_declaration
+        "interface" @name
+        name: (_) @name) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (export_statement
+        (enum_declaration
+            "enum" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (enum_declaration
+        "enum" @name
+        name: (_) @name) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (export_statement
+        (type_alias_declaration
+            "type" @name
+            name: (_) @name)) @item
+    )
+
+(
+    (comment)* @context
+    .
+    (type_alias_declaration
+        "type" @name
+        name: (_) @name) @item)