@zzzen/pyright-internal 1.2.0-dev.20240414 → 1.2.0-dev.20240421

package/dist/analyzer/typeEvaluator.js

@@ -170,7 +170,7 @@ const printExpressionTypes = false;
 // complex. Otherwise we risk overflowing the stack or incurring extremely
 // long analysis times. This number has been tuned empirically.
 exports.maxCodeComplexity = 768;
-function createTypeEvaluator(importLookup, evaluatorOptions) {
+function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     const symbolResolutionStack = [];
     const asymmetricAccessorAssignmentCache = new Set();
     const speculativeTypeTracker = new typeCacheUtils_1.SpeculativeTypeTracker();
@@ -15859,7 +15859,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return types_1.UnknownType.create();
     }
-    function getFunctionInferredReturnType(type, args) {
+    function _getFunctionInferredReturnType(type, args) {
         var _a;
         let returnType;
         let isIncomplete = false;
@@ -17432,12 +17432,23 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 else if (remainingDestSubtypes.length === remainingSrcSubtypes.length) {
                     // If the number of remaining source subtypes is the same as the number
                     // of dest TypeVars, try to assign each source subtype to its own dest TypeVar.
-                    remainingDestSubtypes.forEach((destSubtype, index) => {
-                        const srcSubtype = remainingSrcSubtypes[index];
-                        if (!assignType(destSubtype, srcSubtype, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                    const reorderedDestSubtypes = [...remainingDestSubtypes];
+                    for (let srcIndex = 0; srcIndex < remainingSrcSubtypes.length; srcIndex++) {
+                        let foundMatchForSrc = false;
+                        for (let destIndex = 0; destIndex < reorderedDestSubtypes.length; destIndex++) {
+                            if (assignType(reorderedDestSubtypes[destIndex], remainingSrcSubtypes[srcIndex], diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                                foundMatchForSrc = true;
+                                // Move the matched dest TypeVar to the end of the list so the other
+                                // dest TypeVars have a better chance of being assigned to.
+                                reorderedDestSubtypes.push(...reorderedDestSubtypes.splice(destIndex, 1));
+                                break;
+                            }
+                        }
+                        if (!foundMatchForSrc) {
                             canUseFastPath = false;
+                            break;
                         }
-                    });
+                    }
                     // We can avoid checking the source subtypes that have already been checked.
                     sortedSrcTypes = remainingSrcSubtypes;
                 }
@@ -19253,6 +19264,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             });
         });
     }
+    // Track these apis internal usages when logging is on. otherwise, it should be noop.
+    const getFunctionInferredReturnType = wrapWithLogger(_getFunctionInferredReturnType);
     const evaluatorInterface = {
         runWithCancellationToken,
         getType,