Merge pull request #649 from Microsoft/propertyAssignmentWidening

ahejlsberg · ahejlsberg · commit b61c722eec81 · 2014-09-11T13:10:08.000-07:00
Fix widening in object literal property assignments
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1354,10 +1354,14 @@ module ts {
             }
             // Use the type of the initializer expression if one is present
             if (declaration.initializer) {
-                var unwidenedType = checkAndMarkExpression(declaration.initializer);
-                var type = getWidenedType(unwidenedType);
-                if (type !== unwidenedType) {
-                    checkImplicitAny(type);
+                var type = checkAndMarkExpression(declaration.initializer);
+                // Widening of property assignments is handled by checkObjectLiteral, exclude them here
+                if (declaration.kind !== SyntaxKind.PropertyAssignment) {
+                    var unwidenedType = type;
+                    type = getWidenedType(type);
+                    if (type !== unwidenedType) {
+                        checkImplicitAny(type);
+                    }
                 }
                 return type;
             }
diff --git a/tests/baselines/reference/arrayBestCommonTypes.types b/tests/baselines/reference/arrayBestCommonTypes.types
@@ -222,7 +222,7 @@ class f {
 >base : base
 >[ { x: undefined, y: new base() }, { x: '', y: new derived() } ] : { x: string; y: base; }[]
 >{ x: undefined, y: new base() } : { x: undefined; y: base; }
->x : any
+>x : undefined
 >undefined : undefined
 >y : base
 >new base() : base
diff --git a/tests/baselines/reference/declFileRegressionTests.types b/tests/baselines/reference/declFileRegressionTests.types
@@ -4,7 +4,7 @@
 var n = { w: null, x: '', y: () => { }, z: 32 };
 >n : { w: any; x: string; y: () => void; z: number; }
 >{ w: null, x: '', y: () => { }, z: 32 } : { w: null; x: string; y: () => void; z: number; }
->w : any
+>w : null
 >x : string
 >y : () => void
 >() => { } : () => void
diff --git a/tests/baselines/reference/declInput3.types b/tests/baselines/reference/declInput3.types
@@ -16,9 +16,9 @@ class bar {
 >a : bar
 ><bar>null : bar
 >bar : bar
->b : any
+>b : undefined
 >undefined : undefined
->c : any
+>c : undefined
 >void 4 : undefined
 
   public h(x = 4, y = null, z = '') { x++; }
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types
@@ -15,7 +15,7 @@ var obj = {x:1,y:null};
 >obj : { x: number; y: any; }
 >{x:1,y:null} : { x: number; y: null; }
 >x : number
->y : any
+>y : null
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types
@@ -26,5 +26,5 @@ var test: IIntervalTreeNode[] = [{ interval: { begin: 0 }, children: null }]; //
 >interval : { begin: number; }
 >{ begin: 0 } : { begin: number; }
 >begin : number
->children : any
+>children : null
 
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -39,7 +39,7 @@ for (var p: Point = { x: 0, y: undefined }; ;) { }
 >Point : Point
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
->y : any
+>y : undefined
 >undefined : undefined
 
 for (var p = { x: 1, y: <number>undefined }; ;) { }
@@ -65,7 +65,7 @@ for (var p = <{ x: number; y: number; }>{ x: 0, y: undefined }; ;) { }
 >y : number
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
->y : any
+>y : undefined
 >undefined : undefined
 
 for (var p: typeof p; ;) { }
diff --git a/tests/baselines/reference/functionImplementations.types b/tests/baselines/reference/functionImplementations.types
@@ -253,8 +253,8 @@ function opt2(n = { x: null, y: undefined }) {
 >opt2 : (n?: { x: any; y: any; }) => void
 >n : { x: any; y: any; }
 >{ x: null, y: undefined } : { x: null; y: undefined; }
->x : any
->y : any
+>x : null
+>y : undefined
 >undefined : undefined
 
     var m = n;
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types
@@ -15,7 +15,7 @@ var obj = {x:1,y:null};
 >obj : { x: number; y: any; }
 >{x:1,y:null} : { x: number; y: null; }
 >x : number
->y : any
+>y : null
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
@@ -95,7 +95,7 @@ var a: Foo = {
 >{} : {}
 
     e: null ,
->e : any
+>e : null
 
     f: [1],
 >f : number[]
diff --git a/tests/baselines/reference/null.types b/tests/baselines/reference/null.types
@@ -41,7 +41,7 @@ var w:I={x:null,y:3};
 >w : I
 >I : I
 >{x:null,y:3} : { x: null; y: number; }
->x : any
+>x : null
 >y : number
 
 
diff --git a/tests/baselines/reference/objectLiteralWidened.types b/tests/baselines/reference/objectLiteralWidened.types
@@ -6,10 +6,10 @@ var x = {
 >{    foo: null,    bar: undefined} : { foo: null; bar: undefined; }
 
     foo: null,
->foo : any
+>foo : null
 
     bar: undefined
->bar : any
+>bar : undefined
 >undefined : undefined
 }
 
@@ -18,17 +18,17 @@ var y = {
 >{    foo: null,    bar: {        baz: null,        boo: undefined    }} : { foo: null; bar: { baz: null; boo: undefined; }; }
 
     foo: null,
->foo : any
+>foo : null
 
     bar: {
->bar : { baz: any; boo: any; }
+>bar : { baz: null; boo: undefined; }
 >{        baz: null,        boo: undefined    } : { baz: null; boo: undefined; }
 
         baz: null,
->baz : any
+>baz : null
 
         boo: undefined
->boo : any
+>boo : undefined
 >undefined : undefined
     }
 }
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
@@ -61,7 +61,7 @@ module Bugs {
 >startIndex : number
 >type : string
 >bracket : number
->state : any
+>state : null
 >length : number
                 }
 }
diff --git a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types
@@ -25,7 +25,7 @@ var b = {
 >{    foo: null} : { foo: null; }
 
     foo: null
->foo : any
+>foo : null
 }
 
 // These should all be of type 'any'
diff --git a/tests/baselines/reference/typeArgInference2.types b/tests/baselines/reference/typeArgInference2.types
@@ -31,7 +31,7 @@ var z3 = foo({ name: null });         // { name: any }
 >foo({ name: null }) : { name: any; }
 >foo : <T extends Item>(x?: T, y?: T) => T
 >{ name: null } : { name: null; }
->name : any
+>name : null
 
 var z4 = foo({ name: "abc" });        // { name: string }
 >z4 : { name: string; }
diff --git a/tests/baselines/reference/typeArgInferenceWithNull.types b/tests/baselines/reference/typeArgInferenceWithNull.types
@@ -22,7 +22,7 @@ fn5({ x: null });
 >fn5({ x: null }) : void
 >fn5 : <T extends { x: string; }>(n: T) => void
 >{ x: null } : { x: null; }
->x : any
+>x : null
 
 function fn6<T extends { x: string }>(n: T, fun: (x: T) => void, n2: T) { }
 >fn6 : <T extends { x: string; }>(n: T, fun: (x: T) => void, n2: T) => void
@@ -40,7 +40,7 @@ fn6({ x: null }, y => { }, { x: "" }); // y has type { x: any }, but ideally wou
 >fn6({ x: null }, y => { }, { x: "" }) : void
 >fn6 : <T extends { x: string; }>(n: T, fun: (x: T) => void, n2: T) => void
 >{ x: null } : { x: null; }
->x : any
+>x : null
 >y => { } : (y: { x: string; }) => void
 >y : { x: string; }
 >{ x: "" } : { x: string; }
diff --git a/tests/baselines/reference/undefinedArgumentInference.types b/tests/baselines/reference/undefinedArgumentInference.types
@@ -19,8 +19,8 @@ var z1 = foo1({ x: undefined, y: undefined });
 >foo1({ x: undefined, y: undefined }) : any
 >foo1 : <T>(f1: { x: T; y: T; }) => T
 >{ x: undefined, y: undefined } : { x: undefined; y: undefined; }
->x : any
+>x : undefined
 >undefined : undefined
->y : any
+>y : undefined
 >undefined : undefined
 
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
@@ -47,7 +47,7 @@ var p: Point = { x: 0, y: undefined };
 >Point : Point
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
->y : any
+>y : undefined
 >undefined : undefined
 
 var p = { x: 1, y: <number>undefined };
@@ -73,7 +73,7 @@ var p = <{ x: number; y: number; }>{ x: 0, y: undefined };
 >y : number
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
->y : any
+>y : undefined
 >undefined : undefined
 
 var p: typeof p;
diff --git a/tests/baselines/reference/widenedTypes1.types b/tests/baselines/reference/widenedTypes1.types
@@ -9,13 +9,13 @@ var b = undefined;
 var c = {x: null};
 >c : { x: any; }
 >{x: null} : { x: null; }
->x : any
+>x : null
 
 var d = [{x: null}];
 >d : { x: any; }[]
 >[{x: null}] : { x: null; }[]
 >{x: null} : { x: null; }
->x : any
+>x : null
 
 var f = [null, null];
 >f : any[]
@@ -31,6 +31,6 @@ var h = [{x: undefined}];
 >h : { x: any; }[]
 >[{x: undefined}] : { x: undefined; }[]
 >{x: undefined} : { x: undefined; }
->x : any
+>x : undefined
 >undefined : undefined
 

Original file line number	Diff line number	Diff line change
`@@ -1354,10 +1354,14 @@ module ts {`
`1354`	`1354`	`}`
`1355`	`1355`	`// Use the type of the initializer expression if one is present`
`1356`	`1356`	`if (declaration.initializer) {`
`1357`		`- var unwidenedType = checkAndMarkExpression(declaration.initializer);`
`1358`		`- var type = getWidenedType(unwidenedType);`
`1359`		`- if (type !== unwidenedType) {`
`1360`		`- checkImplicitAny(type);`
	`1357`	`+ var type = checkAndMarkExpression(declaration.initializer);`
	`1358`	`+ // Widening of property assignments is handled by checkObjectLiteral, exclude them here`
	`1359`	`+ if (declaration.kind !== SyntaxKind.PropertyAssignment) {`
	`1360`	`+ var unwidenedType = type;`
	`1361`	`+ type = getWidenedType(type);`
	`1362`	`+ if (type !== unwidenedType) {`
	`1363`	`+ checkImplicitAny(type);`
	`1364`	`+ }`
`1361`	`1365`	`}`
`1362`	`1366`	`return type;`
`1363`	`1367`	`}`