Widen after sub-type-reduction took place

mhegazy · mhegazy · commit 24ddbe4b60a2 · 2017-02-09T14:55:07.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3378,7 +3378,7 @@ namespace ts {
         }
 
         // Return the inferred type for a variable, parameter, or property declaration
-        function getWidenedTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type {
+        function getTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type {
             const expression = declaration.kind === SyntaxKind.BinaryExpression ? <BinaryExpression>declaration :
                 declaration.kind === SyntaxKind.PropertyAccessExpression ? <BinaryExpression>getAncestor(declaration, SyntaxKind.BinaryExpression) :
                 undefined;
@@ -3395,7 +3395,7 @@ namespace ts {
                 }
             }
 
-            return getWidenedType(getWidenedLiteralType(checkExpressionCached(expression.right)));
+            return getWidenedLiteralType(checkExpressionCached(expression.right));
         }
 
         // Return the type implied by a binding pattern element. This is the type of the initializer of the element if
@@ -3552,7 +3552,7 @@ namespace ts {
                 // * className.prototype.method = expr
                 if (declaration.kind === SyntaxKind.BinaryExpression ||
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
-                    type = getUnionType(map(symbol.declarations, getWidenedTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true);
+                    type = getWidenedType(getUnionType(map(symbol.declarations, getTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true));
                 }
                 else {
                     type = getWidenedTypeForVariableLikeDeclaration(<VariableLikeDeclaration>declaration, /*reportErrors*/ true);
diff --git a/tests/baselines/reference/jsFileClassPropertyType3.errors.txt b/tests/baselines/reference/jsFileClassPropertyType3.errors.txt
@@ -0,0 +1,22 @@
+tests/cases/compiler/bar.ts(2,1): error TS2322: Type '"string"' is not assignable to type 'number'.
+
+
+==== tests/cases/compiler/foo.js (0 errors) ====
+    
+    class C {
+        constructor() {
+            if (cond) {
+                this.p = null;
+            }
+            else {
+                this.p = 0;
+            }
+        }
+    }
+    
+==== tests/cases/compiler/bar.ts (1 errors) ====
+    
+    (new C()).p = "string"; // Error
+    ~~~~~~~~~~~
+!!! error TS2322: Type '"string"' is not assignable to type 'number'.
+    
diff --git a/tests/baselines/reference/multipleDeclarations.types b/tests/baselines/reference/multipleDeclarations.types
@@ -21,7 +21,7 @@ C.prototype.m = function() {
     this.nothing();
 >this.nothing() : any
 >this.nothing : any
->this : { m: any; }
+>this : { m: () => void; }
 >nothing : any
 }
 class X {
diff --git a/tests/cases/compiler/jsFileClassPropertyType3.ts b/tests/cases/compiler/jsFileClassPropertyType3.ts
@@ -0,0 +1,18 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: foo.js
+class C {
+    constructor() {
+        if (cond) {
+            this.p = null;
+        }
+        else {
+            this.p = 0;
+        }
+    }
+}
+
+// @filename: bar.ts
+
+(new C()).p = "string"; // Error

Original file line number	Diff line number	Diff line change
`@@ -3378,7 +3378,7 @@ namespace ts {`
`3378`	`3378`	`}`
`3379`	`3379`
`3380`	`3380`	`// Return the inferred type for a variable, parameter, or property declaration`
`3381`		`- function getWidenedTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type {`
	`3381`	`+ function getTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type {`
`3382`	`3382`	`const expression = declaration.kind === SyntaxKind.BinaryExpression ? <BinaryExpression>declaration :`
`3383`	`3383`	`declaration.kind === SyntaxKind.PropertyAccessExpression ? <BinaryExpression>getAncestor(declaration, SyntaxKind.BinaryExpression) :`
`3384`	`3384`	`undefined;`
`@@ -3395,7 +3395,7 @@ namespace ts {`
`3395`	`3395`	`}`
`3396`	`3396`	`}`
`3397`	`3397`
`3398`		`- return getWidenedType(getWidenedLiteralType(checkExpressionCached(expression.right)));`
	`3398`	`+ return getWidenedLiteralType(checkExpressionCached(expression.right));`
`3399`	`3399`	`}`
`3400`	`3400`
`3401`	`3401`	`// Return the type implied by a binding pattern element. This is the type of the initializer of the element if`
`@@ -3552,7 +3552,7 @@ namespace ts {`
`3552`	`3552`	`// * className.prototype.method = expr`
`3553`	`3553`	`if (declaration.kind === SyntaxKind.BinaryExpression \|\|`
`3554`	`3554`	`declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {`
`3555`		`- type = getUnionType(map(symbol.declarations, getWidenedTypeForJSSpecialPropertyDeclaration), /subtypeReduction/ true);`
	`3555`	`+ type = getWidenedType(getUnionType(map(symbol.declarations, getTypeForJSSpecialPropertyDeclaration), /subtypeReduction/ true));`
`3556`	`3556`	`}`
`3557`	`3557`	`else {`
`3558`	`3558`	`type = getWidenedTypeForVariableLikeDeclaration(<VariableLikeDeclaration>declaration, /reportErrors/ true);`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ C.prototype.m = function() {`
`21`	`21`	`this.nothing();`
`22`	`22`	`>this.nothing() : any`
`23`	`23`	`>this.nothing : any`
`24`		`->this : { m: any; }`
	`24`	`+>this : { m: () => void; }`
`25`	`25`	`>nothing : any`
`26`	`26`	`}`
`27`	`27`	`class X {`