Update LKG

mhegazy · mhegazy · commit 1e41af30fee7 · 2016-05-25T12:27:29.000-07:00
diff --git a/lib/tsc.js b/lib/tsc.js
@@ -18090,7 +18090,7 @@ var ts;
                             inferFromTypes(source, t);
                         }
                     }
-                    if (target.flags & 16384 && typeParameterCount === 1) {
+                    if (typeParameterCount === 1) {
                         inferiority++;
                         inferFromTypes(source, typeParameter);
                         inferiority--;
diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -18854,7 +18854,7 @@ var ts;
                             inferFromTypes(source, t);
                         }
                     }
-                    if (target.flags & 16384 && typeParameterCount === 1) {
+                    if (typeParameterCount === 1) {
                         inferiority++;
                         inferFromTypes(source, typeParameter);
                         inferiority--;
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -18854,7 +18854,7 @@ var ts;
                             inferFromTypes(source, t);
                         }
                     }
-                    if (target.flags & 16384 && typeParameterCount === 1) {
+                    if (typeParameterCount === 1) {
                         inferiority++;
                         inferFromTypes(source, typeParameter);
                         inferiority--;
diff --git a/lib/typescript.js b/lib/typescript.js
@@ -21958,11 +21958,10 @@ var ts;
                             inferFromTypes(source, t);
                         }
                     }
-                    // Next, if target is a union type containing a single naked type parameter, make a
-                    // secondary inference to that type parameter. We don't do this for intersection types
-                    // because in a target type like Foo & T we don't know how which parts of the source type
-                    // should be matched by Foo and which should be inferred to T.
-                    if (target.flags & 16384 /* Union */ && typeParameterCount === 1) {
+                    // Next, if target containings a single naked type parameter, make a secondary inference to that type
+                    // parameter. This gives meaningful results for union types in co-variant positions and intersection
+                    // types in contra-variant positions (such as callback parameters).
+                    if (typeParameterCount === 1) {
                         inferiority++;
                         inferFromTypes(source, typeParameter);
                         inferiority--;
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
@@ -21958,11 +21958,10 @@ var ts;
                             inferFromTypes(source, t);
                         }
                     }
-                    // Next, if target is a union type containing a single naked type parameter, make a
-                    // secondary inference to that type parameter. We don't do this for intersection types
-                    // because in a target type like Foo & T we don't know how which parts of the source type
-                    // should be matched by Foo and which should be inferred to T.
-                    if (target.flags & 16384 /* Union */ && typeParameterCount === 1) {
+                    // Next, if target containings a single naked type parameter, make a secondary inference to that type
+                    // parameter. This gives meaningful results for union types in co-variant positions and intersection
+                    // types in contra-variant positions (such as callback parameters).
+                    if (typeParameterCount === 1) {
                         inferiority++;
                         inferFromTypes(source, typeParameter);
                         inferiority--;

Original file line number	Diff line number	Diff line change
`@@ -18090,7 +18090,7 @@ var ts;`
`18090`	`18090`	`inferFromTypes(source, t);`
`18091`	`18091`	`}`
`18092`	`18092`	`}`
`18093`		`- if (target.flags & 16384 && typeParameterCount === 1) {`
	`18093`	`+ if (typeParameterCount === 1) {`
`18094`	`18094`	`inferiority++;`
`18095`	`18095`	`inferFromTypes(source, typeParameter);`
`18096`	`18096`	`inferiority--;`
Original file line number	Diff line number	Diff line change
`@@ -18854,7 +18854,7 @@ var ts;`
`18854`	`18854`	`inferFromTypes(source, t);`
`18855`	`18855`	`}`
`18856`	`18856`	`}`
`18857`		`- if (target.flags & 16384 && typeParameterCount === 1) {`
	`18857`	`+ if (typeParameterCount === 1) {`
`18858`	`18858`	`inferiority++;`
`18859`	`18859`	`inferFromTypes(source, typeParameter);`
`18860`	`18860`	`inferiority--;`