Automatic semicolon insertion before 'extends' in conditional type

ahejlsberg · ahejlsberg · commit 0d3f2166e32f · 2018-02-05T13:56:10.000-08:00
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

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`