Merge branch 'master' into object_is

Author: aryx

common/corpus/types.txt

@@ -767,7 +767,7 @@ type T = typeof array[number];
   (type_alias_declaration (type_identifier)
     (intersection_type (index_type_query (type_identifier)) (type_identifier)))
   (type_alias_declaration (type_identifier)
-    (type_query (subscript_expression (identifier) (predefined_type)))))
+    (lookup_type (type_query (identifier)) (predefined_type))))
 
 =======================================
 Lookup types
@@ -1342,9 +1342,10 @@ type T = Foo<Bar<typeof bar["baz"]>>
         (generic_type
           (type_identifier)
           (type_arguments
-            (type_query
-              (subscript_expression
-                (identifier)
+            (lookup_type
+              (type_query
+                (identifier))
+              (literal_type
                 (string
                   (string_fragment))))))))))
 
@@ -1431,3 +1432,33 @@ type Foo<T> = abstract new () => T;
 ---
 
 (program (type_alias_declaration (type_identifier) (type_parameters (type_parameter (type_identifier))) (constructor_type (formal_parameters) (type_identifier)))) 
+
+=========================
+Indexed Access Precedence
+=========================
+
+// These should generate the same AST aside from the parenthesized_type node
+type X1 = typeof Y[keyof typeof Z];
+type X2 = (typeof Y)[keyof typeof Z];
+
+---
+
+(program
+  (comment)
+  (type_alias_declaration
+    (type_identifier)
+    (lookup_type
+      (type_query
+        (identifier))
+      (index_type_query
+        (type_query
+          (identifier)))))
+  (type_alias_declaration
+    (type_identifier)
+    (lookup_type
+      (parenthesized_type
+        (type_query
+          (identifier)))
+      (index_type_query
+        (type_query
+          (identifier))))))

common/define-grammar.js

@@ -45,6 +45,7 @@ module.exports = function defineGrammar(dialect) {
       [$.readonly_type, $.pattern],
       [$.readonly_type, $.primary_expression],
       [$.type_query, $.subscript_expression, $.expression],
+      [$.type_query, $._type_query_subscript_expression],
       [$.nested_type_identifier, $.generic_type, $._primary_type, $.lookup_type, $.index_type_query, $._type],
       [$.as_expression, $._primary_type],
       [$._type_query_member_expression, $.member_expression],

tsx/src/grammar.json

@@ -10814,6 +10814,16 @@
         "name": "expression"
       }
     ],
+    [
+      {
+        "type": "SYMBOL",
+        "name": "type_query"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "_type_query_subscript_expression"
+      }
+    ],
     [
       {
         "type": "SYMBOL",