Create diagnostics, move to checker grammar check

jakebailey · jakebailey · commit 728c9b4c61a2 · 2022-06-22T14:59:40.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -28912,7 +28912,14 @@ namespace ts {
             return nonNullType;
         }
 
+        function checkGrammarPropertyAccessExpression(node: PropertyAccessExpression) {
+            if (node.expression.kind === SyntaxKind.ExpressionWithTypeArguments) {
+                grammarErrorOnNode(node.name, Diagnostics.Instantiation_expression_cannot_be_followed_by_property_access);
+            }
+        }
+
         function checkPropertyAccessExpression(node: PropertyAccessExpression, checkMode: CheckMode | undefined) {
+            checkGrammarPropertyAccessExpression(node);
             return node.flags & NodeFlags.OptionalChain ? checkPropertyAccessChain(node as PropertyAccessChain, checkMode) :
                 checkPropertyAccessExpressionOrQualifiedName(node, node.expression, checkNonNullExpression(node.expression), node.name, checkMode);
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -1493,6 +1493,10 @@
         "category": "Message",
         "code": 1476
     },
+    "Instantiation expression cannot be followed by property access.": {
+        "category": "Error",
+        "code": 1477
+    },
 
     "The types of '{0}' are incompatible between these types.": {
         "category": "Error",
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -5683,10 +5683,6 @@ namespace ts {
                 }
 
                 if (isPropertyAccess) {
-                    // TODO: issue a better error?
-                    if (expression.kind === SyntaxKind.ExpressionWithTypeArguments) {
-                        return expression as MemberExpression;
-                    }
                     expression = parsePropertyAccessExpressionRest(pos, expression, questionDotToken);
                     continue;
                 }
diff --git a/tests/baselines/reference/genericCallWithoutArgs.errors.txt b/tests/baselines/reference/genericCallWithoutArgs.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/genericCallWithoutArgs.ts(4,18): error TS1003: Identifier expected.
+
+
+==== tests/cases/compiler/genericCallWithoutArgs.ts (1 errors) ====
+    function f<X, Y>(x: X, y: Y) {
+    }
+    
+    f<number,string>.
+                     
+!!! error TS1003: Identifier expected.
diff --git a/tests/baselines/reference/genericCallWithoutArgs.js b/tests/baselines/reference/genericCallWithoutArgs.js
@@ -7,4 +7,4 @@ f<number,string>.
 //// [genericCallWithoutArgs.js]
 function f(x, y) {
 }
-f;
+f.;
diff --git a/tests/baselines/reference/genericCallWithoutArgs.types b/tests/baselines/reference/genericCallWithoutArgs.types
@@ -6,6 +6,8 @@ function f<X, Y>(x: X, y: Y) {
 }
 
 f<number,string>.
+>f<number,string>. : any
 >f<number,string> : (x: number, y: string) => void
 >f : <X, Y>(x: X, y: Y) => void
+> : any
 
diff --git a/tests/baselines/reference/instantiationExpressionErrors.errors.txt b/tests/baselines/reference/instantiationExpressionErrors.errors.txt
@@ -1,11 +1,3 @@
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(7,22): error TS1005: ',' expected.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(7,22): error TS2451: Cannot redeclare block-scoped variable 'g'.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(7,22): error TS7005: Variable 'g' implicitly has an 'any' type.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(8,22): error TS1005: ',' expected.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(8,22): error TS2451: Cannot redeclare block-scoped variable 'g'.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(8,22): error TS7005: Variable 'g' implicitly has an 'any' type.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(8,23): error TS1005: ',' expected.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(8,31): error TS1109: Expression expected.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(13,12): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string[]'.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(13,14): error TS2693: 'number' only refers to a type, but is being used as a value here.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(18,12): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
@@ -14,10 +6,6 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpr
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(19,24): error TS2635: Type '{ (): number; g<U>(): U; }' has no signatures for which the type argument list is applicable.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(23,23): error TS1005: '(' expected.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(26,24): error TS2558: Expected 0 type arguments, but got 1.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(30,13): error TS2451: Cannot redeclare block-scoped variable 'g'.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(32,14): error TS2635: Type 'any' has no signatures for which the type argument list is applicable.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(33,14): error TS2635: Type 'any' has no signatures for which the type argument list is applicable.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(34,14): error TS2635: Type 'any' has no signatures for which the type argument list is applicable.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(39,2): error TS2554: Expected 0 arguments, but got 1.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(43,12): error TS2365: Operator '<' cannot be applied to types '{ <T>(): T; g<U>(): U; }' and 'boolean'.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(44,12): error TS2365: Operator '<' cannot be applied to types '{ <T>(): T; g<U>(): U; }' and 'boolean'.
@@ -26,31 +14,15 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpr
 tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts(45,12): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
 
 
-==== tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts (26 errors) ====
+==== tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts (14 errors) ====
     declare let f: { <T>(): T, g<U>(): U };
     
     // Type arguments in member expressions
     
     const a1 = f<number>;  // { (): number; g<U>(): U; }
     const a2 = f.g<number>;  // () => number
     const a3 = f<number>.g;  // <U>() => U
-                         ~
-!!! error TS1005: ',' expected.
-                         ~
-!!! error TS2451: Cannot redeclare block-scoped variable 'g'.
-                         ~
-!!! error TS7005: Variable 'g' implicitly has an 'any' type.
     const a4 = f<number>.g<number>;  // () => number
-                         ~
-!!! error TS1005: ',' expected.
-                         ~
-!!! error TS2451: Cannot redeclare block-scoped variable 'g'.
-                         ~
-!!! error TS7005: Variable 'g' implicitly has an 'any' type.
-                          ~
-!!! error TS1005: ',' expected.
-                                  ~
-!!! error TS1109: Expression expected.
     const a5 = f['g']<number>;  // () => number
     
     // `[` is an expression starter and cannot immediately follow a type argument list
@@ -89,18 +61,10 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpr
     // Instantiation expression and binary operators
     
     declare let g: (<T>(x: T) => T) | undefined;
-                ~
-!!! error TS2451: Cannot redeclare block-scoped variable 'g'.
     
     const c1 = g<string> || ((x: string) => x);
-                 ~~~~~~
-!!! error TS2635: Type 'any' has no signatures for which the type argument list is applicable.
     const c2 = g<string> ?? ((x: string) => x);
-                 ~~~~~~
-!!! error TS2635: Type 'any' has no signatures for which the type argument list is applicable.
     const c3 = g<string> && ((x: string) => x);
-                 ~~~~~~
-!!! error TS2635: Type 'any' has no signatures for which the type argument list is applicable.
     
     // Parsed as function call, even though this differs from JavaScript
     
diff --git a/tests/baselines/reference/instantiationExpressionErrors.js b/tests/baselines/reference/instantiationExpressionErrors.js
@@ -110,9 +110,8 @@ var _a, _b, _c;
 // Type arguments in member expressions
 var a1 = (f); // { (): number; g<U>(): U; }
 var a2 = (f.g); // () => number
-var a3 = (f), g; // <U>() => U
-var a4 = (f), g;
-; // () => number
+var a3 = f.g; // <U>() => U
+var a4 = (f.g); // () => number
 var a5 = (f['g']); // () => number
 // `[` is an expression starter and cannot immediately follow a type argument list
 var a6 = f < number > ['g']; // Error
@@ -200,14 +199,8 @@ declare const a1: {
     g<U>(): U;
 };
 declare const a2: () => number;
-declare const a3: {
-    (): number;
-    g<U>(): U;
-}, g: any;
-declare const a4: {
-    (): number;
-    g<U>(): U;
-}, g: any;
+declare const a3: <U>() => U;
+declare const a4: () => number;
 declare const a5: () => number;
 declare const a6: boolean;
 declare const a7: <U>() => U;
@@ -220,9 +213,9 @@ declare const b2: number;
 declare const b3: number;
 declare const b4: number;
 declare let g: (<T>(x: T) => T) | undefined;
-declare const c1: any;
-declare const c2: any;
-declare const c3: any;
+declare const c1: (x: string) => string;
+declare const c2: (x: string) => string;
+declare const c3: ((x: string) => string) | undefined;
 declare const x1: true;
 declare const r1: boolean;
 declare const r2: boolean;
diff --git a/tests/baselines/reference/instantiationExpressionErrors.symbols b/tests/baselines/reference/instantiationExpressionErrors.symbols
@@ -21,13 +21,15 @@ const a2 = f.g<number>;  // () => number
 
 const a3 = f<number>.g;  // <U>() => U
 >a3 : Symbol(a3, Decl(instantiationExpressionErrors.ts, 6, 5))
+>f<number>.g : Symbol(g, Decl(instantiationExpressionErrors.ts, 0, 26))
 >f : Symbol(f, Decl(instantiationExpressionErrors.ts, 0, 11))
->g : Symbol(g, Decl(instantiationExpressionErrors.ts, 6, 21))
+>g : Symbol(g, Decl(instantiationExpressionErrors.ts, 0, 26))
 
 const a4 = f<number>.g<number>;  // () => number
 >a4 : Symbol(a4, Decl(instantiationExpressionErrors.ts, 7, 5))
+>f<number>.g : Symbol(g, Decl(instantiationExpressionErrors.ts, 0, 26))
 >f : Symbol(f, Decl(instantiationExpressionErrors.ts, 0, 11))
->g : Symbol(g, Decl(instantiationExpressionErrors.ts, 7, 21))
+>g : Symbol(g, Decl(instantiationExpressionErrors.ts, 0, 26))
 
 const a5 = f['g']<number>;  // () => number
 >a5 : Symbol(a5, Decl(instantiationExpressionErrors.ts, 8, 5))
@@ -84,19 +86,19 @@ declare let g: (<T>(x: T) => T) | undefined;
 
 const c1 = g<string> || ((x: string) => x);
 >c1 : Symbol(c1, Decl(instantiationExpressionErrors.ts, 31, 5))
->g : Symbol(g, Decl(instantiationExpressionErrors.ts, 6, 21))
+>g : Symbol(g, Decl(instantiationExpressionErrors.ts, 29, 11))
 >x : Symbol(x, Decl(instantiationExpressionErrors.ts, 31, 26))
 >x : Symbol(x, Decl(instantiationExpressionErrors.ts, 31, 26))
 
 const c2 = g<string> ?? ((x: string) => x);
 >c2 : Symbol(c2, Decl(instantiationExpressionErrors.ts, 32, 5))
->g : Symbol(g, Decl(instantiationExpressionErrors.ts, 6, 21))
+>g : Symbol(g, Decl(instantiationExpressionErrors.ts, 29, 11))
 >x : Symbol(x, Decl(instantiationExpressionErrors.ts, 32, 26))
 >x : Symbol(x, Decl(instantiationExpressionErrors.ts, 32, 26))
 
 const c3 = g<string> && ((x: string) => x);
 >c3 : Symbol(c3, Decl(instantiationExpressionErrors.ts, 33, 5))
->g : Symbol(g, Decl(instantiationExpressionErrors.ts, 6, 21))
+>g : Symbol(g, Decl(instantiationExpressionErrors.ts, 29, 11))
 >x : Symbol(x, Decl(instantiationExpressionErrors.ts, 33, 26))
 >x : Symbol(x, Decl(instantiationExpressionErrors.ts, 33, 26))
 
diff --git a/tests/baselines/reference/instantiationExpressionErrors.types b/tests/baselines/reference/instantiationExpressionErrors.types
@@ -18,18 +18,19 @@ const a2 = f.g<number>;  // () => number
 >g : <U>() => U
 
 const a3 = f<number>.g;  // <U>() => U
->a3 : { (): number; g<U>(): U; }
+>a3 : <U>() => U
+>f<number>.g : <U>() => U
 >f<number> : { (): number; g<U>(): U; }
 >f : { <T>(): T; g<U>(): U; }
->g : any
+>g : <U>() => U
 
 const a4 = f<number>.g<number>;  // () => number
->a4 : { (): number; g<U>(): U; }
+>a4 : () => number
+>f<number>.g<number> : () => number
+>f<number>.g : <U>() => U
 >f<number> : { (): number; g<U>(): U; }
 >f : { <T>(): T; g<U>(): U; }
->g : any
-><number> : number
-> : any
+>g : <U>() => U
 
 const a5 = f['g']<number>;  // () => number
 >a5 : () => number
@@ -106,30 +107,30 @@ declare let g: (<T>(x: T) => T) | undefined;
 >x : T
 
 const c1 = g<string> || ((x: string) => x);
->c1 : any
->g<string> || ((x: string) => x) : any
->g<string> : any
->g : any
+>c1 : (x: string) => string
+>g<string> || ((x: string) => x) : (x: string) => string
+>g<string> : ((x: string) => string) | undefined
+>g : (<T>(x: T) => T) | undefined
 >((x: string) => x) : (x: string) => string
 >(x: string) => x : (x: string) => string
 >x : string
 >x : string
 
 const c2 = g<string> ?? ((x: string) => x);
->c2 : any
->g<string> ?? ((x: string) => x) : any
->g<string> : any
->g : any
+>c2 : (x: string) => string
+>g<string> ?? ((x: string) => x) : (x: string) => string
+>g<string> : ((x: string) => string) | undefined
+>g : (<T>(x: T) => T) | undefined
 >((x: string) => x) : (x: string) => string
 >(x: string) => x : (x: string) => string
 >x : string
 >x : string
 
 const c3 = g<string> && ((x: string) => x);
->c3 : any
->g<string> && ((x: string) => x) : any
->g<string> : any
->g : any
+>c3 : ((x: string) => string) | undefined
+>g<string> && ((x: string) => x) : ((x: string) => string) | undefined
+>g<string> : ((x: string) => string) | undefined
+>g : (<T>(x: T) => T) | undefined
 >((x: string) => x) : (x: string) => string
 >(x: string) => x : (x: string) => string
 >x : string
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).errors.txt b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).errors.txt
@@ -1,8 +1,7 @@
-tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error TS1005: ';' expected.
-tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error TS2304: Cannot find name 'd'.
+tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error TS1477: Instantiation expression cannot be followed by property access.
 
 
-==== tests/cases/compiler/optionalChainWithInstantiationExpression1.ts (2 errors) ====
+==== tests/cases/compiler/optionalChainWithInstantiationExpression1.ts (1 errors) ====
     declare namespace A {
         export class b<T> {
             static d: number;
@@ -16,9 +15,7 @@ tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error T
     
     a?.b<c>.d;
             ~
-!!! error TS1005: ';' expected.
-            ~
-!!! error TS2304: Cannot find name 'd'.
+!!! error TS1477: Instantiation expression cannot be followed by property access.
     
     a?.b.d
     
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).js b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).js
@@ -16,6 +16,5 @@ a?.b.d
 
 
 //// [optionalChainWithInstantiationExpression1.js]
-(a === null || a === void 0 ? void 0 : a.b);
-d;
+(a === null || a === void 0 ? void 0 : a.b).d;
 a === null || a === void 0 ? void 0 : a.b.d;
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).symbols b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).symbols
@@ -23,10 +23,12 @@ declare const a: typeof A | undefined;
 >A : Symbol(A, Decl(optionalChainWithInstantiationExpression1.ts, 0, 0))
 
 a?.b<c>.d;
+>a?.b<c>.d : Symbol(A.b.d, Decl(optionalChainWithInstantiationExpression1.ts, 1, 23))
 >a?.b : Symbol(A.b, Decl(optionalChainWithInstantiationExpression1.ts, 0, 21))
 >a : Symbol(a, Decl(optionalChainWithInstantiationExpression1.ts, 9, 13))
 >b : Symbol(A.b, Decl(optionalChainWithInstantiationExpression1.ts, 0, 21))
 >c : Symbol(c, Decl(optionalChainWithInstantiationExpression1.ts, 5, 1))
+>d : Symbol(A.b.d, Decl(optionalChainWithInstantiationExpression1.ts, 1, 23))
 
 a?.b.d
 >a?.b.d : Symbol(A.b.d, Decl(optionalChainWithInstantiationExpression1.ts, 1, 23))
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).types b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2019).types
@@ -21,11 +21,12 @@ declare const a: typeof A | undefined;
 >A : typeof A
 
 a?.b<c>.d;
+>a?.b<c>.d : number
 >a?.b<c> : { new (x: unknown): A.b<unknown>; prototype: A.b<any>; d: number; }
 >a?.b : typeof A.b
 >a : typeof A
 >b : typeof A.b
->d : any
+>d : number
 
 a?.b.d
 >a?.b.d : number
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).errors.txt b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).errors.txt
@@ -1,8 +1,7 @@
-tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error TS1005: ';' expected.
-tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error TS2304: Cannot find name 'd'.
+tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error TS1477: Instantiation expression cannot be followed by property access.
 
 
-==== tests/cases/compiler/optionalChainWithInstantiationExpression1.ts (2 errors) ====
+==== tests/cases/compiler/optionalChainWithInstantiationExpression1.ts (1 errors) ====
     declare namespace A {
         export class b<T> {
             static d: number;
@@ -16,9 +15,7 @@ tests/cases/compiler/optionalChainWithInstantiationExpression1.ts(12,9): error T
     
     a?.b<c>.d;
             ~
-!!! error TS1005: ';' expected.
-            ~
-!!! error TS2304: Cannot find name 'd'.
+!!! error TS1477: Instantiation expression cannot be followed by property access.
     
     a?.b.d
     
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).js b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).js
@@ -16,6 +16,5 @@ a?.b.d
 
 
 //// [optionalChainWithInstantiationExpression1.js]
-a?.b;
-d;
+a?.b.d;
 a?.b.d;
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).symbols b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).symbols
@@ -23,10 +23,12 @@ declare const a: typeof A | undefined;
 >A : Symbol(A, Decl(optionalChainWithInstantiationExpression1.ts, 0, 0))
 
 a?.b<c>.d;
+>a?.b<c>.d : Symbol(A.b.d, Decl(optionalChainWithInstantiationExpression1.ts, 1, 23))
 >a?.b : Symbol(A.b, Decl(optionalChainWithInstantiationExpression1.ts, 0, 21))
 >a : Symbol(a, Decl(optionalChainWithInstantiationExpression1.ts, 9, 13))
 >b : Symbol(A.b, Decl(optionalChainWithInstantiationExpression1.ts, 0, 21))
 >c : Symbol(c, Decl(optionalChainWithInstantiationExpression1.ts, 5, 1))
+>d : Symbol(A.b.d, Decl(optionalChainWithInstantiationExpression1.ts, 1, 23))
 
 a?.b.d
 >a?.b.d : Symbol(A.b.d, Decl(optionalChainWithInstantiationExpression1.ts, 1, 23))
diff --git a/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).types b/tests/baselines/reference/optionalChainWithInstantiationExpression1(target=es2020).types
diff --git a/tests/baselines/reference/parserMemberAccessExpression1.errors.txt b/tests/baselines/reference/parserMemberAccessExpression1.errors.txt
diff --git a/tests/baselines/reference/parserMemberAccessExpression1.js b/tests/baselines/reference/parserMemberAccessExpression1.js
diff --git a/tests/baselines/reference/parserMemberAccessExpression1.types b/tests/baselines/reference/parserMemberAccessExpression1.types
diff --git a/tests/baselines/reference/parserMemberAccessOffOfGenericType1.errors.txt b/tests/baselines/reference/parserMemberAccessOffOfGenericType1.errors.txt
diff --git a/tests/baselines/reference/parserMemberAccessOffOfGenericType1.js b/tests/baselines/reference/parserMemberAccessOffOfGenericType1.js
diff --git a/tests/baselines/reference/parserMemberAccessOffOfGenericType1.symbols b/tests/baselines/reference/parserMemberAccessOffOfGenericType1.symbols
diff --git a/tests/baselines/reference/parserMemberAccessOffOfGenericType1.types b/tests/baselines/reference/parserMemberAccessOffOfGenericType1.types

Original file line number	Diff line number	Diff line change
`@@ -28912,7 +28912,14 @@ namespace ts {`
`28912`	`28912`	`return nonNullType;`
`28913`	`28913`	`}`
`28914`	`28914`
	`28915`	`+ function checkGrammarPropertyAccessExpression(node: PropertyAccessExpression) {`
	`28916`	`+ if (node.expression.kind === SyntaxKind.ExpressionWithTypeArguments) {`
	`28917`	`+ grammarErrorOnNode(node.name, Diagnostics.Instantiation_expression_cannot_be_followed_by_property_access);`
	`28918`	`+ }`
	`28919`	`+ }`
	`28920`	`+`
`28915`	`28921`	`function checkPropertyAccessExpression(node: PropertyAccessExpression, checkMode: CheckMode \| undefined) {`
	`28922`	`+ checkGrammarPropertyAccessExpression(node);`
`28916`	`28923`	`return node.flags & NodeFlags.OptionalChain ? checkPropertyAccessChain(node as PropertyAccessChain, checkMode) :`
`28917`	`28924`	`checkPropertyAccessExpressionOrQualifiedName(node, node.expression, checkNonNullExpression(node.expression), node.name, checkMode);`
`28918`	`28925`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5683,10 +5683,6 @@ namespace ts {`
`5683`	`5683`	`}`
`5684`	`5684`
`5685`	`5685`	`if (isPropertyAccess) {`
`5686`		`- // TODO: issue a better error?`
`5687`		`- if (expression.kind === SyntaxKind.ExpressionWithTypeArguments) {`
`5688`		`- return expression as MemberExpression;`
`5689`		`- }`
`5690`	`5686`	`expression = parsePropertyAccessExpressionRest(pos, expression, questionDotToken);`
`5691`	`5687`	`continue;`
`5692`	`5688`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@ f<number,string>.`
`7`	`7`	`//// [genericCallWithoutArgs.js]`
`8`	`8`	`function f(x, y) {`
`9`	`9`	`}`
`10`		`-f;`
	`10`	`+f.;`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ function f<X, Y>(x: X, y: Y) {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`f<number,string>.`
	`9`	`+>f<number,string>. : any`
`9`	`10`	`>f<number,string> : (x: number, y: string) => void`
`10`	`11`	`>f : <X, Y>(x: X, y: Y) => void`
	`12`	`+> : any`
`11`	`13`