Improve comments in source and tests

sandersn · sandersn · commit 0b911d564863 · 2017-05-24T13:52:29.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -8981,10 +8981,6 @@ namespace ts {
             function typeRelatedToEachType(source: Type, target: IntersectionType, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const targetTypes = target.types;
-                // disable weak-type detection for the main check
-                // unless all of target.types are weak, in which case run weak type detection on the *combined* properties of target
-                // at a minimum, do the first part.
-                // but the thing should be flexible enough to easily do the second part as a separate call
                 const saveDynamicDisableWeakTypeErrors = dynamicDisableWeakTypeErrors;
                 dynamicDisableWeakTypeErrors = true;
                 for (const targetType of targetTypes) {
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
@@ -4,15 +4,15 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Weak type 'C' has no properties in common with 'E'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(35,5): error TS2322: Type 'F' is not assignable to type 'C'.
   Weak type 'C' has no properties in common with 'F'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(38,5): error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(36,5): error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
   Weak type '{ opt?: Base; }' has no properties in common with 'D'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(39,5): error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(37,5): error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
   Weak type '{ opt?: Base; }' has no properties in common with 'E'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(40,5): error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(38,5): error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
   Weak type '{ opt?: Base; }' has no properties in common with 'F'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(43,5): error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(44,5): error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(45,5): error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(39,5): error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(40,5): error TS2322: Type 'E' is not assignable to type '{ opt?: Base; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(41,5): error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(74,5): error TS2322: Type 'D' is not assignable to type 'C'.
   Property 'opt' is missing in type 'D'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts(75,5): error TS2322: Type 'E' is not assignable to type 'C'.
@@ -65,7 +65,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         var e: E;
         var f: F;
     
-        // all ok
+        // disallowed by weak type checking
         c = d;
         ~
 !!! error TS2322: Type 'D' is not assignable to type 'C'.
@@ -78,8 +78,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~
 !!! error TS2322: Type 'F' is not assignable to type 'C'.
 !!! error TS2322:   Weak type 'C' has no properties in common with 'F'.
-        c = a;
-    
         a = d;
         ~
 !!! error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
@@ -92,8 +90,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~
 !!! error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
 !!! error TS2322:   Weak type '{ opt?: Base; }' has no properties in common with 'F'.
-        a = c;
-    
         b = d;
         ~
 !!! error TS2322: Type 'D' is not assignable to type '{ opt?: Base; }'.
@@ -103,6 +99,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         b = f;
         ~
 !!! error TS2322: Type 'F' is not assignable to type '{ opt?: Base; }'.
+    
+        // ok
+        c = a;
+        a = c;
         b = a;
         b = c;
     }
@@ -173,4 +173,5 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Property 'opt' is missing in type 'F'.
         b = a; // ok
         b = c; // ok
-    }
+    }
+    
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -30,20 +30,20 @@ module TargetHasOptional {
     var e: E;
     var f: F;
 
-    // all ok
+    // disallowed by weak type checking
     c = d;
     c = e;
     c = f;
-    c = a;
-
     a = d;
     a = e;
     a = f;
-    a = c;
-
     b = d;
     b = e;
     b = f;
+
+    // ok
+    c = a;
+    a = c;
     b = a;
     b = c;
 }
@@ -87,7 +87,8 @@ module SourceHasOptional {
     b = f; // error
     b = a; // ok
     b = c; // ok
-}
+}
+
 
 //// [assignmentCompatWithObjectMembersOptionality2.js]
 // M is optional and S contains no property with the same name as M
@@ -129,18 +130,19 @@ var TargetHasOptional;
     var d;
     var e;
     var f;
-    // all ok
+    // disallowed by weak type checking
     c = d;
     c = e;
     c = f;
-    c = a;
     a = d;
     a = e;
     a = f;
-    a = c;
     b = d;
     b = e;
     b = f;
+    // ok
+    c = a;
+    a = c;
     b = a;
     b = c;
 })(TargetHasOptional || (TargetHasOptional = {}));
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt
@@ -68,7 +68,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~
 !!! error TS2420: Class 'B' incorrectly implements interface 'A'.
 !!! error TS2420:   Weak type 'A' has no properties in common with 'B'.
-            fooo: Derived; // ok
+            fooo: Derived; // weak type error
         }
     
         interface A2 {
@@ -79,7 +79,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~~
 !!! error TS2420: Class 'B2' incorrectly implements interface 'A2'.
 !!! error TS2420:   Weak type 'A2' has no properties in common with 'B2'.
-            2: Derived; // ok
+            2: Derived; // weak type error
         }
     
         interface A3 {
@@ -90,6 +90,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
               ~~
 !!! error TS2420: Class 'B3' incorrectly implements interface 'A3'.
 !!! error TS2420:   Weak type 'A3' has no properties in common with 'B3'.
-            '1.0': Derived; // ok
+            '1.0': Derived; // weak type error
         }
-    }
+    }
+    
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.js b/tests/baselines/reference/subtypingWithObjectMembers5.js
@@ -42,25 +42,26 @@ module Optional {
     }
 
     class B implements A {
-        fooo: Derived; // ok
+        fooo: Derived; // weak type error
     }
 
     interface A2 {
         1?: Base;
     }
 
     class B2 implements A2 {
-        2: Derived; // ok
+        2: Derived; // weak type error
     }
 
     interface A3 {
         '1'?: Base;
     }
 
     class B3 implements A3 {
-        '1.0': Derived; // ok
+        '1.0': Derived; // weak type error
     }
-}
+}
+
 
 //// [subtypingWithObjectMembers5.js]
 // N and M have the same name, same accessibility, same optionality, and N is a subtype of M
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts
@@ -29,20 +29,20 @@ module TargetHasOptional {
     var e: E;
     var f: F;
 
-    // all ok
+    // disallowed by weak type checking
     c = d;
     c = e;
     c = f;
-    c = a;
-
     a = d;
     a = e;
     a = f;
-    a = c;
-
     b = d;
     b = e;
     b = f;
+
+    // ok
+    c = a;
+    a = c;
     b = a;
     b = c;
 }
@@ -86,4 +86,4 @@ module SourceHasOptional {
     b = f; // error
     b = a; // ok
     b = c; // ok
-}
+}
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts
@@ -41,22 +41,22 @@ module Optional {
     }
 
     class B implements A {
-        fooo: Derived; // ok
+        fooo: Derived; // weak type error
     }
 
     interface A2 {
         1?: Base;
     }
 
     class B2 implements A2 {
-        2: Derived; // ok
+        2: Derived; // weak type error
     }
 
     interface A3 {
         '1'?: Base;
     }
 
     class B3 implements A3 {
-        '1.0': Derived; // ok
+        '1.0': Derived; // weak type error
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW`
`68`	`68`	`~`
`69`	`69`	`!!! error TS2420: Class 'B' incorrectly implements interface 'A'.`
`70`	`70`	`!!! error TS2420: Weak type 'A' has no properties in common with 'B'.`
`71`		`- fooo: Derived; // ok`
	`71`	`+ fooo: Derived; // weak type error`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`interface A2 {`
`@@ -79,7 +79,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW`
`79`	`79`	`~~`
`80`	`80`	`!!! error TS2420: Class 'B2' incorrectly implements interface 'A2'.`
`81`	`81`	`!!! error TS2420: Weak type 'A2' has no properties in common with 'B2'.`
`82`		`- 2: Derived; // ok`
	`82`	`+ 2: Derived; // weak type error`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`interface A3 {`
`@@ -90,6 +90,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW`
`90`	`90`	`~~`
`91`	`91`	`!!! error TS2420: Class 'B3' incorrectly implements interface 'A3'.`
`92`	`92`	`!!! error TS2420: Weak type 'A3' has no properties in common with 'B3'.`
`93`		`- '1.0': Derived; // ok`
	`93`	`+ '1.0': Derived; // weak type error`
`94`	`94`	`}`
`95`		`- }`
	`95`	`+ }`
	`96`	`+`
Original file line number	Diff line number	Diff line change
`@@ -42,25 +42,26 @@ module Optional {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`class B implements A {`
`45`		`- fooo: Derived; // ok`
	`45`	`+ fooo: Derived; // weak type error`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`interface A2 {`
`49`	`49`	`1?: Base;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`class B2 implements A2 {`
`53`		`- 2: Derived; // ok`
	`53`	`+ 2: Derived; // weak type error`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`interface A3 {`
`57`	`57`	`'1'?: Base;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`class B3 implements A3 {`
`61`		`- '1.0': Derived; // ok`
	`61`	`+ '1.0': Derived; // weak type error`
`62`	`62`	`}`
`63`		`-}`
	`63`	`+}`
	`64`	`+`
`64`	`65`
`65`	`66`	`//// [subtypingWithObjectMembers5.js]`
`66`	`67`	`// N and M have the same name, same accessibility, same optionality, and N is a subtype of M`
Original file line number	Diff line number	Diff line change
`@@ -41,22 +41,22 @@ module Optional {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`class B implements A {`
`44`		`- fooo: Derived; // ok`
	`44`	`+ fooo: Derived; // weak type error`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`interface A2 {`
`48`	`48`	`1?: Base;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`class B2 implements A2 {`
`52`		`- 2: Derived; // ok`
	`52`	`+ 2: Derived; // weak type error`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`interface A3 {`
`56`	`56`	`'1'?: Base;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`class B3 implements A3 {`
`60`		`- '1.0': Derived; // ok`
	`60`	`+ '1.0': Derived; // weak type error`
`61`	`61`	`}`
`62`		`-}`
	`62`	`+}`