Don't treat a colon in a conditional expression branch as part of an arrow function (microsoft#47550)

jakebailey · web-flow · commit 2dede207ae13 · 2022-02-25T13:08:18.000-08:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression10.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts(1,1): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts(1,6): error TS2304: Cannot find name 'b'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts(1,17): error TS2304: Cannot find name 'd'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts(1,20): error TS1005: ';' expected.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts(1,27): error TS2304: Cannot find name 'f'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts (5 errors) ====
+    a ? (b) : c => (d) : e => f
+    ~
+!!! error TS2304: Cannot find name 'a'.
+         ~
+!!! error TS2304: Cannot find name 'b'.
+                    ~
+!!! error TS2304: Cannot find name 'd'.
+                       ~
+!!! error TS1005: ';' expected.
+                              ~
+!!! error TS2304: Cannot find name 'f'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.js b/tests/baselines/reference/parserArrowFunctionExpression10.js
@@ -0,0 +1,7 @@
+//// [parserArrowFunctionExpression10.ts]
+a ? (b) : c => (d) : e => f
+
+
+//// [parserArrowFunctionExpression10.js]
+a ? (b) : function (c) { return (d); };
+(function (e) { return f; });
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.symbols b/tests/baselines/reference/parserArrowFunctionExpression10.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts ===
+a ? (b) : c => (d) : e => f
+>c : Symbol(c, Decl(parserArrowFunctionExpression10.ts, 0, 9))
+>e : Symbol(e, Decl(parserArrowFunctionExpression10.ts, 0, 20))
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.types b/tests/baselines/reference/parserArrowFunctionExpression10.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts ===
+a ? (b) : c => (d) : e => f
+>a ? (b) : c => (d) : any
+>a : any
+>(b) : any
+>b : any
+>c => (d) : (c: any) => any
+>c : any
+>(d) : any
+>d : any
+>e => f : (e: any) => any
+>e : any
+>f : any
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression11.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression11.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts(1,1): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts(1,5): error TS2304: Cannot find name 'b'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts(1,9): error TS2304: Cannot find name 'c'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts(1,14): error TS2304: Cannot find name 'd'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts(1,24): error TS2304: Cannot find name 'f'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts (5 errors) ====
+    a ? b ? c : (d) : e => f
+    ~
+!!! error TS2304: Cannot find name 'a'.
+        ~
+!!! error TS2304: Cannot find name 'b'.
+            ~
+!!! error TS2304: Cannot find name 'c'.
+                 ~
+!!! error TS2304: Cannot find name 'd'.
+                           ~
+!!! error TS2304: Cannot find name 'f'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression11.js b/tests/baselines/reference/parserArrowFunctionExpression11.js
@@ -0,0 +1,6 @@
+//// [parserArrowFunctionExpression11.ts]
+a ? b ? c : (d) : e => f
+
+
+//// [parserArrowFunctionExpression11.js]
+a ? b ? c : (d) : function (e) { return f; };
diff --git a/tests/baselines/reference/parserArrowFunctionExpression11.symbols b/tests/baselines/reference/parserArrowFunctionExpression11.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts ===
+a ? b ? c : (d) : e => f
+>e : Symbol(e, Decl(parserArrowFunctionExpression11.ts, 0, 17))
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression11.types b/tests/baselines/reference/parserArrowFunctionExpression11.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts ===
+a ? b ? c : (d) : e => f
+>a ? b ? c : (d) : e => f : any
+>a : any
+>b ? c : (d) : any
+>b : any
+>c : any
+>(d) : any
+>d : any
+>e => f : (e: any) => any
+>e : any
+>f : any
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression12.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(1,1): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(1,13): error TS2304: Cannot find name 'c'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(1,22): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts (3 errors) ====
+    a ? (b) => (c): d => e
+    ~
+!!! error TS2304: Cannot find name 'a'.
+                ~
+!!! error TS2304: Cannot find name 'c'.
+                         ~
+!!! error TS2304: Cannot find name 'e'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.js b/tests/baselines/reference/parserArrowFunctionExpression12.js
@@ -0,0 +1,6 @@
+//// [parserArrowFunctionExpression12.ts]
+a ? (b) => (c): d => e
+
+
+//// [parserArrowFunctionExpression12.js]
+a ? function (b) { return (c); } : function (d) { return e; };
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.symbols b/tests/baselines/reference/parserArrowFunctionExpression12.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts ===
+a ? (b) => (c): d => e
+>b : Symbol(b, Decl(parserArrowFunctionExpression12.ts, 0, 5))
+>d : Symbol(d, Decl(parserArrowFunctionExpression12.ts, 0, 15))
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.types b/tests/baselines/reference/parserArrowFunctionExpression12.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts ===
+a ? (b) => (c): d => e
+>a ? (b) => (c): d => e : (b: any) => any
+>a : any
+>(b) => (c) : (b: any) => any
+>b : any
+>(c) : any
+>c : any
+>d => e : (d: any) => any
+>d : any
+>e : any
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression13.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression13.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression13.ts(1,1): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression13.ts(1,11): error TS2304: Cannot find name 'a'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression13.ts (2 errors) ====
+    a ? () => a() : (): any => null;
+    ~
+!!! error TS2304: Cannot find name 'a'.
+              ~
+!!! error TS2304: Cannot find name 'a'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression13.js b/tests/baselines/reference/parserArrowFunctionExpression13.js
@@ -0,0 +1,6 @@
+//// [parserArrowFunctionExpression13.ts]
+a ? () => a() : (): any => null;
+
+
+//// [parserArrowFunctionExpression13.js]
+a ? function () { return a(); } : function () { return null; };
diff --git a/tests/baselines/reference/parserArrowFunctionExpression13.symbols b/tests/baselines/reference/parserArrowFunctionExpression13.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression13.ts ===
+a ? () => a() : (): any => null;
+No type information for this code.
+No type information for this code.
diff --git a/tests/baselines/reference/parserArrowFunctionExpression13.types b/tests/baselines/reference/parserArrowFunctionExpression13.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression13.ts ===
+a ? () => a() : (): any => null;
+>a ? () => a() : (): any => null : () => any
+>a : any
+>() => a() : () => any
+>a() : any
+>a : any
+>(): any => null : () => any
+>null : null
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression14.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression14.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts(1,1): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts(1,40): error TS2304: Cannot find name 'd'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts(1,46): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts (3 errors) ====
+    a() ? (b: number, c?: string): void => d() : e;
+    ~
+!!! error TS2304: Cannot find name 'a'.
+                                           ~
+!!! error TS2304: Cannot find name 'd'.
+                                                 ~
+!!! error TS2304: Cannot find name 'e'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression14.js b/tests/baselines/reference/parserArrowFunctionExpression14.js
@@ -0,0 +1,6 @@
+//// [parserArrowFunctionExpression14.ts]
+a() ? (b: number, c?: string): void => d() : e;
+
+
+//// [parserArrowFunctionExpression14.js]
+a() ? function (b, c) { return d(); } : e;
diff --git a/tests/baselines/reference/parserArrowFunctionExpression14.symbols b/tests/baselines/reference/parserArrowFunctionExpression14.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts ===
+a() ? (b: number, c?: string): void => d() : e;
+>b : Symbol(b, Decl(parserArrowFunctionExpression14.ts, 0, 7))
+>c : Symbol(c, Decl(parserArrowFunctionExpression14.ts, 0, 17))
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression14.types b/tests/baselines/reference/parserArrowFunctionExpression14.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts ===
+a() ? (b: number, c?: string): void => d() : e;
+>a() ? (b: number, c?: string): void => d() : e : any
+>a() : any
+>a : any
+>(b: number, c?: string): void => d() : (b: number, c?: string) => void
+>b : number
+>c : string
+>d() : any
+>d : any
+>e : any
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression8.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts(1,1): error TS2304: Cannot find name 'x'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts (1 errors) ====
+    x ? y => ({ y }) : z => ({ z })
+    ~
+!!! error TS2304: Cannot find name 'x'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8.js b/tests/baselines/reference/parserArrowFunctionExpression8.js
@@ -0,0 +1,6 @@
+//// [parserArrowFunctionExpression8.ts]
+x ? y => ({ y }) : z => ({ z })
+
+
+//// [parserArrowFunctionExpression8.js]
+x ? function (y) { return ({ y: y }); } : function (z) { return ({ z: z }); };
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8.symbols b/tests/baselines/reference/parserArrowFunctionExpression8.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts ===
+x ? y => ({ y }) : z => ({ z })
+>y : Symbol(y, Decl(parserArrowFunctionExpression8.ts, 0, 3))
+>y : Symbol(y, Decl(parserArrowFunctionExpression8.ts, 0, 11))
+>z : Symbol(z, Decl(parserArrowFunctionExpression8.ts, 0, 18))
+>z : Symbol(z, Decl(parserArrowFunctionExpression8.ts, 0, 26))
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8.types b/tests/baselines/reference/parserArrowFunctionExpression8.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts ===
+x ? y => ({ y }) : z => ({ z })
+>x ? y => ({ y }) : z => ({ z }) : ((y: any) => { y: any; }) | ((z: any) => { z: any; })
+>x : any
+>y => ({ y }) : (y: any) => { y: any; }
+>y : any
+>({ y }) : { y: any; }
+>{ y } : { y: any; }
+>y : any
+>z => ({ z }) : (z: any) => { z: any; }
+>z : any
+>({ z }) : { z: any; }
+>{ z } : { z: any; }
+>z : any
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8Js.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression8Js.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/file.js(1,1): error TS2304: Cannot find name 'x'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/file.js (1 errors) ====
+    x ? y => ({ y }) : z => ({ z })
+    ~
+!!! error TS2304: Cannot find name 'x'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8Js.js b/tests/baselines/reference/parserArrowFunctionExpression8Js.js
@@ -0,0 +1,6 @@
+//// [file.js]
+x ? y => ({ y }) : z => ({ z })
+
+
+//// [file.js]
+x ? function (y) { return ({ y: y }); } : function (z) { return ({ z: z }); };
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8Js.symbols b/tests/baselines/reference/parserArrowFunctionExpression8Js.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/file.js ===
+x ? y => ({ y }) : z => ({ z })
+>y : Symbol(y, Decl(file.js, 0, 3))
+>y : Symbol(y, Decl(file.js, 0, 11))
+>z : Symbol(z, Decl(file.js, 0, 18))
+>z : Symbol(z, Decl(file.js, 0, 26))
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression8Js.types b/tests/baselines/reference/parserArrowFunctionExpression8Js.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/file.js ===
+x ? y => ({ y }) : z => ({ z })
+>x ? y => ({ y }) : z => ({ z }) : ((y: any) => { y: any; }) | ((z: any) => { z: any; })
+>x : any
+>y => ({ y }) : (y: any) => { y: any; }
+>y : any
+>({ y }) : { y: any; }
+>{ y } : { y: any; }
+>y : any
+>z => ({ z }) : (z: any) => { z: any; }
+>z : any
+>({ z }) : { z: any; }
+>{ z } : { z: any; }
+>z : any
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression9.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression9.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts(1,1): error TS2304: Cannot find name 'b'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts(1,6): error TS2304: Cannot find name 'c'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts(1,16): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts (3 errors) ====
+    b ? (c) : d => e
+    ~
+!!! error TS2304: Cannot find name 'b'.
+         ~
+!!! error TS2304: Cannot find name 'c'.
+                   ~
+!!! error TS2304: Cannot find name 'e'.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression9.js b/tests/baselines/reference/parserArrowFunctionExpression9.js
@@ -0,0 +1,6 @@
+//// [parserArrowFunctionExpression9.ts]
+b ? (c) : d => e
+
+
+//// [parserArrowFunctionExpression9.js]
+b ? (c) : function (d) { return e; };
diff --git a/tests/baselines/reference/parserArrowFunctionExpression9.symbols b/tests/baselines/reference/parserArrowFunctionExpression9.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts ===
+b ? (c) : d => e
+>d : Symbol(d, Decl(parserArrowFunctionExpression9.ts, 0, 9))
+
diff --git a/tests/baselines/reference/parserArrowFunctionExpression9.types b/tests/baselines/reference/parserArrowFunctionExpression9.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts ===
+b ? (c) : d => e
+>b ? (c) : d => e : any
+>b : any
+>(c) : any
+>c : any
+>d => e : (d: any) => any
+>d : any
+>e : any
+
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts
@@ -0,0 +1 @@
+a ? (b) : c => (d) : e => f
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts
@@ -0,0 +1 @@
+a ? b ? c : (d) : e => f
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts
@@ -0,0 +1 @@
+a ? (b) => (c): d => e
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression13.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression13.ts
@@ -0,0 +1 @@
+a ? () => a() : (): any => null;
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression14.ts
@@ -0,0 +1 @@
+a() ? (b: number, c?: string): void => d() : e;
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts
@@ -0,0 +1 @@
+x ? y => ({ y }) : z => ({ z })
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8Js.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8Js.ts
@@ -0,0 +1,6 @@
+// @filename: file.js
+// @allowjs: true
+// @checkjs: true
+// @outdir: out
+
+x ? y => ({ y }) : z => ({ z })
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts
@@ -0,0 +1 @@
+b ? (c) : d => e
