Merge pull request microsoft#21649 from Microsoft/conditionalTypesASI

ahejlsberg · web-flow · commit 3b220a8b0fdf · 2018-02-05T16:21:34.000-08:00
Conditional types ASI
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -2986,7 +2986,7 @@ namespace ts {
                 return parseFunctionOrConstructorType(SyntaxKind.ConstructorType);
             }
             const type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && parseOptional(SyntaxKind.ExtendsKeyword)) {
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(SyntaxKind.ExtendsKeyword)) {
                 const node = <ConditionalTypeNode>createNode(SyntaxKind.ConditionalType, type.pos);
                 node.checkType = type;
                 // The type following 'extends' is not permitted to be another conditional type
diff --git a/tests/baselines/reference/conditionalTypesASI.js b/tests/baselines/reference/conditionalTypesASI.js
@@ -0,0 +1,18 @@
+//// [conditionalTypesASI.ts]
+// Repro from #21637
+
+interface JSONSchema4 {
+  a?: number
+  extends?: string | string[]
+}
+
+
+//// [conditionalTypesASI.js]
+// Repro from #21637
+
+
+//// [conditionalTypesASI.d.ts]
+interface JSONSchema4 {
+    a?: number;
+    extends?: string | string[];
+}
diff --git a/tests/baselines/reference/conditionalTypesASI.symbols b/tests/baselines/reference/conditionalTypesASI.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/conditionalTypesASI.ts ===
+// Repro from #21637
+
+interface JSONSchema4 {
+>JSONSchema4 : Symbol(JSONSchema4, Decl(conditionalTypesASI.ts, 0, 0))
+
+  a?: number
+>a : Symbol(JSONSchema4.a, Decl(conditionalTypesASI.ts, 2, 23))
+
+  extends?: string | string[]
+>extends : Symbol(JSONSchema4.extends, Decl(conditionalTypesASI.ts, 3, 12))
+}
+
diff --git a/tests/baselines/reference/conditionalTypesASI.types b/tests/baselines/reference/conditionalTypesASI.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/conditionalTypesASI.ts ===
+// Repro from #21637
+
+interface JSONSchema4 {
+>JSONSchema4 : JSONSchema4
+
+  a?: number
+>a : number
+
+  extends?: string | string[]
+>extends : string | string[]
+}
+
diff --git a/tests/cases/compiler/conditionalTypesASI.ts b/tests/cases/compiler/conditionalTypesASI.ts
@@ -0,0 +1,8 @@
+// @declaration: true
+
+// Repro from #21637
+
+interface JSONSchema4 {
+  a?: number
+  extends?: string | string[]
+}

Original file line number	Diff line number	Diff line change
`@@ -2986,7 +2986,7 @@ namespace ts {`
`2986`	`2986`	`return parseFunctionOrConstructorType(SyntaxKind.ConstructorType);`
`2987`	`2987`	`}`
`2988`	`2988`	`const type = parseUnionTypeOrHigher();`
`2989`		`- if (!noConditionalTypes && parseOptional(SyntaxKind.ExtendsKeyword)) {`
	`2989`	`+ if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(SyntaxKind.ExtendsKeyword)) {`
`2990`	`2990`	`const node = <ConditionalTypeNode>createNode(SyntaxKind.ConditionalType, type.pos);`
`2991`	`2991`	`node.checkType = type;`
`2992`	`2992`	`// The type following 'extends' is not permitted to be another conditional type`