Update LKG

Author: Ben Lichtman

lib/tsc.js

@@ -67,7 +67,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "3.6";
-    ts.version = ts.versionMajorMinor + ".1-rc";
+    ts.version = ts.versionMajorMinor + ".2";
 })(ts || (ts = {}));
 (function (ts) {
     ts.emptyArray = [];
@@ -38588,8 +38588,7 @@ var ts;
             var visited;
             var bivariant = false;
             var propagationType;
-            var inferenceMatch = false;
-            var inferenceIncomplete = false;
+            var inferencePriority = 256;
             var allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
@@ -38679,7 +38678,7 @@ var ts;
                                 clearCachedInferences(inferences);
                             }
                         }
-                        inferenceMatch = true;
+                        inferencePriority = Math.min(inferencePriority, priority);
                         return;
                     }
                     else {
@@ -38757,21 +38756,15 @@ var ts;
                 var key = source.id + "," + target.id;
                 var status = visited && visited.get(key);
                 if (status !== undefined) {
-                    if (status & 1)
-                        inferenceMatch = true;
-                    if (status & 2)
-                        inferenceIncomplete = true;
+                    inferencePriority = Math.min(inferencePriority, status);
                     return;
                 }
-                (visited || (visited = ts.createMap())).set(key, 0);
-                var saveInferenceMatch = inferenceMatch;
-                var saveInferenceIncomplete = inferenceIncomplete;
-                inferenceMatch = false;
-                inferenceIncomplete = false;
+                (visited || (visited = ts.createMap())).set(key, -1);
+                var saveInferencePriority = inferencePriority;
+                inferencePriority = 256;
                 action(source, target);
-                visited.set(key, (inferenceMatch ? 1 : 0) | (inferenceIncomplete ? 2 : 0));
-                inferenceMatch = inferenceMatch || saveInferenceMatch;
-                inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                visited.set(key, inferencePriority);
+                inferencePriority = Math.min(inferencePriority, saveInferencePriority);
             }
             function inferFromMatchingType(source, targets, matches) {
                 var matched = false;
@@ -38841,8 +38834,7 @@ var ts;
                     var nakedTypeVariable = void 0;
                     var sources = source.flags & 1048576 ? source.types : [source];
                     var matched_1 = new Array(sources.length);
-                    var saveInferenceIncomplete = inferenceIncomplete;
-                    inferenceIncomplete = false;
+                    var inferenceCircularity = false;
                     for (var _i = 0, targets_3 = targets; _i < targets_3.length; _i++) {
                         var t = targets_3[_i];
                         if (getInferenceInfoForType(t)) {
@@ -38851,18 +38843,17 @@ var ts;
                         }
                         else {
                             for (var i = 0; i < sources.length; i++) {
-                                var saveInferenceMatch = inferenceMatch;
-                                inferenceMatch = false;
+                                var saveInferencePriority = inferencePriority;
+                                inferencePriority = 256;
                                 inferFromTypes(sources[i], t);
-                                if (inferenceMatch)
+                                if (inferencePriority === priority)
                                     matched_1[i] = true;
-                                inferenceMatch = inferenceMatch || saveInferenceMatch;
+                                inferenceCircularity = inferenceCircularity || inferencePriority === -1;
+                                inferencePriority = Math.min(inferencePriority, saveInferencePriority);
                             }
                         }
                     }
-                    var inferenceComplete = !inferenceIncomplete;
-                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
-                    if (typeVariableCount === 1 && inferenceComplete) {
+                    if (typeVariableCount === 1 && !inferenceCircularity) {
                         var unmatched = ts.flatMap(sources, function (s, i) { return matched_1[i] ? undefined : s; });
                         if (unmatched.length) {
                             inferFromTypes(getUnionType(unmatched), nakedTypeVariable);
@@ -38940,7 +38931,7 @@ var ts;
                 var symbol = isNonConstructorObject ? target.symbol : undefined;
                 if (symbol) {
                     if (ts.contains(symbolStack, symbol)) {
-                        inferenceIncomplete = true;
+                        inferencePriority = -1;
                         return;
                     }
                     (symbolStack || (symbolStack = [])).push(symbol);

lib/tsserver.js

@@ -2441,7 +2441,9 @@ declare namespace ts {
         LiteralKeyof = 32,
         NoConstraints = 64,
         AlwaysStrict = 128,
-        PriorityImpliesCombination = 56
+        MaxValue = 256,
+        PriorityImpliesCombination = 56,
+        Circularity = -1
     }
     /** @deprecated Use FileExtensionInfo instead. */
     export type JsFileExtensionInfo = FileExtensionInfo;