@zzzen/pyright-internal 1.2.0-dev.20220807 → 1.2.0-dev.20220828

package/dist/analyzer/typeEvaluator.js

@@ -180,7 +180,11 @@ const maxReturnTypeInferenceArgumentCount = 6;
 // we will analyze to determine the return type of a function
 // when its parameters are unannotated? We want to keep this
 // pretty low because this can be very costly.
-const maxReturnTypeInferenceCodeFlowComplexity = 8;
+const maxReturnTypeInferenceCodeFlowComplexity = 32;
+// What is the max complexity of the code flow graph for
+// call-site type inference? This is very expensive, so we
+// want to keep this very low.
+const maxReturnCallSiteTypeInferenceCodeFlowComplexity = 8;
 // What is the max number of return types cached per function
 // when using call-site inference?
 const maxCallSiteReturnTypeCacheSize = 8;
@@ -1884,11 +1888,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return (suppressedNodeStack.some((suppressedNode) => ParseTreeUtils.isNodeContainedWithin(node, suppressedNode)) ||
             speculativeTypeTracker.isSpeculative(node));
     }
-    function addDiagnostic(diagLevel, rule, message, node) {
+    function addDiagnostic(diagLevel, rule, message, node, range) {
         if (diagLevel === 'none') {
             return undefined;
         }
-        const diagnostic = addDiagnosticWithSuppressionCheck(diagLevel, message, node);
+        const diagnostic = addDiagnosticWithSuppressionCheck(diagLevel, message, node, range);
         if (diagnostic) {
             diagnostic.setRule(rule);
         }
@@ -1917,6 +1921,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeExpectedClass().format({ type: printType(type) }) + diag.getString(), node);
     }
     function assignTypeToNameNode(nameNode, type, isTypeIncomplete, ignoreEmptyContainers, srcExpression, allowAssignmentToFinalVar = false, expectedTypeDiagAddendum) {
+        var _a, _b;
         const nameValue = nameNode.value;
         const symbolWithScope = lookUpSymbolRecursive(nameNode, nameValue, /* honorCodeFlow */ false);
         if (!symbolWithScope) {
@@ -1954,7 +1959,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAssignmentMismatch().format({
                     sourceType: printType(type),
                     destType: printType(declaredType),
-                }) + diagAddendum.getString(), srcExpression !== null && srcExpression !== void 0 ? srcExpression : nameNode);
+                }) + diagAddendum.getString(), srcExpression !== null && srcExpression !== void 0 ? srcExpression : nameNode, (_b = (_a = diagAddendum.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : srcExpression) !== null && _b !== void 0 ? _b : nameNode);
                 // Replace the assigned type with the (unnarrowed) declared type.
                 destType = declaredType;
             }
@@ -2856,7 +2861,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // cannot be used in this location.
     function validateTypeVarUsage(node, type, flags) {
         var _a;
-        if (types_1.TypeBase.isInstantiable(type) && !(0, typeUtils_1.isTypeAliasPlaceholder)(type)) {
+        if (types_1.TypeBase.isInstantiable(type) && !type.scopeId && !(0, typeUtils_1.isTypeAliasPlaceholder)(type)) {
             const scopedTypeVarInfo = findScopedTypeVar(node, type);
             type = scopedTypeVarInfo.type;
             if ((flags & 2048 /* DisallowTypeVarsWithScopeId */) !== 0 && type.scopeId !== undefined) {
@@ -3145,7 +3150,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return typeResult;
     }
     function getTypeOfMemberAccessWithBaseType(node, baseTypeResult, usage, flags) {
-        var _a;
+        var _a, _b;
         let baseType = baseTypeResult.type;
         const memberName = node.memberName.value;
         let diag = new diagnostic_1.DiagnosticAddendum();
@@ -3239,12 +3244,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                 }
                 else {
-                    // Handle the special case of LiteralString.
-                    if (types_1.ClassType.isBuiltIn(baseType, 'LiteralString') &&
-                        strClassType &&
-                        (0, types_1.isInstantiableClass)(strClassType)) {
-                        baseType = types_1.ClassType.cloneAsInstance(strClassType);
-                    }
                     // Handle the special case of 'name' and 'value' members within an enum.
                     const enumMemberResult = (0, enums_1.getTypeOfEnumMember)(evaluatorInterface, node, baseType, memberName, isIncomplete);
                     if (enumMemberResult) {
@@ -3421,7 +3420,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const [ruleSet, rule] = isFunctionRule
                     ? [fileInfo.diagnosticRuleSet.reportFunctionMemberAccess, diagnosticRules_1.DiagnosticRule.reportFunctionMemberAccess]
                     : [fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues];
-                addDiagnostic(ruleSet, rule, diagMessage.format({ name: memberName, type: printType(baseType) }) + diag.getString(), node.memberName);
+                addDiagnostic(ruleSet, rule, diagMessage.format({ name: memberName, type: printType(baseType) }) + diag.getString(), node.memberName, (_a = diag.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : node.memberName);
             }
             // If this is member access on a function, use "Any" so if the
             // reportFunctionMemberAccess rule is disabled, we don't trigger
@@ -3442,7 +3441,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // It can also come up in cases like "isinstance(x, (list, dict))".
             if ((0, types_1.isInstantiableClass)(type)) {
                 const argNode = ParseTreeUtils.getParentNodeOfType(node, 1 /* Argument */);
-                if (argNode && ((_a = argNode === null || argNode === void 0 ? void 0 : argNode.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 9 /* Call */) {
+                if (argNode && ((_b = argNode === null || argNode === void 0 ? void 0 : argNode.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 9 /* Call */) {
                     skipPartialUnknownCheck = true;
                 }
             }
@@ -5442,7 +5441,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // Is this a union type? If so, we can expand it.
             const argType = contextFreeArgTypes[indexToExpand];
             if ((0, types_1.isUnion)(argType)) {
-                unionToExpand = argType;
+                unionToExpand = makeTopLevelTypeVarsConcrete(argType);
+                break;
+            }
+            else if ((0, types_1.isTypeVar)(argType) && argType.details.constraints.length > 1) {
+                unionToExpand = makeTopLevelTypeVarsConcrete(argType);
                 break;
             }
             indexToExpand++;
@@ -7209,6 +7212,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return !reportedArgError;
     }
     function validateArgType(argParam, typeVarContext, functionType, skipUnknownCheck, skipOverloadArg, useNarrowBoundOnly, conditionFilter) {
+        var _a;
         let argType;
         let expectedTypeDiag;
         let isTypeIncomplete = false;
@@ -7382,7 +7386,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if (expectedTypeDiag) {
                     diag = expectedTypeDiag;
                 }
-                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, message + diag.getString(), argParam.errorNode);
+                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, message + diag.getString(), argParam.errorNode, (_a = diag.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : argParam.errorNode);
             }
             return { isCompatible: false, argType, isTypeIncomplete, condition };
         }
@@ -7678,7 +7682,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         /* declaredMetaclass */ undefined, arg1Type.details.effectiveMetaclass);
         arg1Type.tupleTypeArguments.forEach((typeArg) => {
             const specializedType = makeTopLevelTypeVarsConcrete(typeArg.type);
-            if ((0, types_1.isInstantiableClass)(specializedType) || (0, types_1.isAnyOrUnknown)(specializedType)) {
+            if ((0, types_1.isInstantiableClass)(specializedType) ||
+                (0, types_1.isAnyOrUnknown)(specializedType) ||
+                ((0, types_1.isClassInstance)(specializedType) && types_1.ClassType.isBuiltIn(specializedType, 'type'))) {
                 classType.details.baseClasses.push(specializedType);
             }
             else {
@@ -8350,12 +8356,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if ((0, types_1.isAnyOrUnknown)(subtype)) {
                 return subtype;
             }
-            if ((0, types_1.isClassInstance)(subtype) &&
-                types_1.ClassType.isBuiltIn(subtype, 'LiteralString') &&
-                strClassType &&
-                (0, types_1.isInstantiableClass)(strClassType)) {
-                return handleSubtype(types_1.ClassType.cloneAsInstance(strClassType));
-            }
             if ((0, types_1.isClassInstance)(subtype) || (0, types_1.isInstantiableClass)(subtype) || (0, types_1.isTypeVar)(subtype)) {
                 return handleSubtype(subtype);
             }
@@ -8441,7 +8441,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 isIncomplete = true;
             }
             if (types_1.ClassType.isTypedDictClass(expectedType)) {
-                const resultTypedDict = (0, typedDicts_1.assignToTypedDict)(evaluatorInterface, expectedType, keyTypes, valueTypes, expectedDiagAddendum);
+                const resultTypedDict = (0, typedDicts_1.assignToTypedDict)(evaluatorInterface, expectedType, keyTypes, valueTypes, 
+                // Don't overwrite existing expectedDiagAddendum messages if they were
+                // already provided by getKeyValueTypesFromDictionary.
+                (expectedDiagAddendum === null || expectedDiagAddendum === void 0 ? void 0 : expectedDiagAddendum.isEmpty()) ? expectedDiagAddendum : undefined);
                 if (resultTypedDict) {
                     return {
                         type: resultTypedDict,
@@ -8475,8 +8478,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // and Iterable use covariant value types, so they can be narrowed.
         const isValueTypeInvariant = (0, types_1.isClassInstance)(expectedType) &&
             (types_1.ClassType.isBuiltIn(expectedType, 'dict') || types_1.ClassType.isBuiltIn(expectedType, 'MutableMapping'));
-        const specializedKeyType = inferTypeArgFromExpectedType(expectedKeyType, keyTypes, /* isNarrowable */ false);
-        const specializedValueType = inferTypeArgFromExpectedType(expectedValueType, valueTypes, 
+        const specializedKeyType = inferTypeArgFromExpectedType(expectedKeyType, keyTypes.map((result) => result.type), 
+        /* isNarrowable */ false);
+        const specializedValueType = inferTypeArgFromExpectedType(expectedValueType, valueTypes.map((result) => result.type), 
         /* isNarrowable */ !isValueTypeInvariant);
         if (!specializedKeyType || !specializedValueType) {
             return undefined;
@@ -8490,17 +8494,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const fallbackType = hasExpectedType ? types_1.AnyType.create() : types_1.UnknownType.create();
         let keyType = fallbackType;
         let valueType = fallbackType;
-        let keyTypes = [];
-        let valueTypes = [];
+        const keyTypeResults = [];
+        const valueTypeResults = [];
         let isEmptyContainer = false;
         let isIncomplete = false;
         // Infer the key and value types if possible.
-        if (getKeyAndValueTypesFromDictionary(node, keyTypes, valueTypes, /* forceStrictInference */ hasExpectedType)) {
+        if (getKeyAndValueTypesFromDictionary(node, keyTypeResults, valueTypeResults, 
+        /* forceStrictInference */ hasExpectedType)) {
             isIncomplete = true;
         }
         // Strip any literal values.
-        keyTypes = keyTypes.map((t) => stripLiteralValue(t));
-        valueTypes = valueTypes.map((t) => stripLiteralValue(t));
+        const keyTypes = keyTypeResults.map((t) => stripLiteralValue(t.type));
+        const valueTypes = valueTypeResults.map((t) => stripLiteralValue(t.type));
         keyType = keyTypes.length > 0 ? (0, types_1.combineTypes)(keyTypes) : fallbackType;
         // If the value type differs and we're not using "strict inference mode",
         // we need to back off because we can't properly represent the mappings
@@ -8562,8 +8567,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     isIncomplete = true;
                 }
                 if (forceStrictInference || index < maxEntriesToUseForInference) {
-                    keyTypes.push(keyType);
-                    valueTypes.push(valueType);
+                    keyTypes.push({ node: entryNode.keyExpression, type: keyType });
+                    valueTypes.push({ node: entryNode.valueExpression, type: valueType });
                 }
                 addUnknown = false;
             }
@@ -8576,6 +8581,21 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if ((0, types_1.isAnyOrUnknown)(unexpandedType)) {
                     addUnknown = false;
                 }
+                else if ((0, types_1.isClassInstance)(unexpandedType) && types_1.ClassType.isTypedDictClass(unexpandedType)) {
+                    // Handle dictionary expansion for a TypedDict.
+                    if (strClassType && (0, types_1.isInstantiableClass)(strClassType)) {
+                        const strObject = types_1.ClassType.cloneAsInstance(strClassType);
+                        const tdEntries = (0, typedDicts_1.getTypedDictMembersForClass)(evaluatorInterface, unexpandedType, 
+                        /* allowNarrowed */ true);
+                        tdEntries.forEach((entry, name) => {
+                            if (entry.isRequired || entry.isProvided) {
+                                keyTypes.push({ node: entryNode, type: types_1.ClassType.cloneWithLiteral(strObject, name) });
+                                valueTypes.push({ node: entryNode, type: entry.valueType });
+                            }
+                        });
+                        addUnknown = false;
+                    }
+                }
                 else {
                     // Verify that the type supports the `keys` and `__getitem__` methods.
                     // This protocol is defined in the _typeshed stub. If we can't find
@@ -8595,8 +8615,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             const typeArgs = specializedMapping.typeArguments;
                             if (typeArgs && typeArgs.length >= 2) {
                                 if (forceStrictInference || index < maxEntriesToUseForInference) {
-                                    keyTypes.push(typeArgs[0]);
-                                    valueTypes.push(typeArgs[1]);
+                                    keyTypes.push({ node: entryNode, type: typeArgs[0] });
+                                    valueTypes.push({ node: entryNode, type: typeArgs[1] });
                                 }
                                 addUnknown = false;
                             }
@@ -8619,8 +8639,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     const typeArgs = (_a = dictEntryType.tupleTypeArguments) === null || _a === void 0 ? void 0 : _a.map((t) => t.type);
                     if (typeArgs && typeArgs.length === 2) {
                         if (forceStrictInference || index < maxEntriesToUseForInference) {
-                            keyTypes.push(typeArgs[0]);
-                            valueTypes.push(typeArgs[1]);
+                            keyTypes.push({ node: entryNode, type: typeArgs[0] });
+                            valueTypes.push({ node: entryNode, type: typeArgs[1] });
                         }
                         addUnknown = false;
                     }
@@ -8628,8 +8648,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             if (addUnknown) {
                 if (forceStrictInference || index < maxEntriesToUseForInference) {
-                    keyTypes.push(types_1.UnknownType.create());
-                    valueTypes.push(types_1.UnknownType.create());
+                    keyTypes.push({ node: entryNode, type: types_1.UnknownType.create() });
+                    valueTypes.push({ node: entryNode, type: types_1.UnknownType.create() });
                 }
             }
         });
@@ -10002,6 +10022,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 return cachedType;
             }
             const specialType = createSpecialBuiltInClass(node, assignedName, aliasMapEntry);
+            // Handle 'LiteralString' specially because we want it to act as
+            // though it derives from 'str'.
+            if (assignedName === 'LiteralString') {
+                specialType.details.baseClasses.push(strClassType !== null && strClassType !== void 0 ? strClassType : types_1.AnyType.create());
+                (0, typeUtils_1.computeMroLinearization)(specialType);
+            }
             writeTypeCache(node, specialType, 0 /* None */, /* isIncomplete */ false);
             return specialType;
         }
@@ -14261,7 +14287,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         const functionNode = type.details.declaration.node;
         const codeFlowComplexity = AnalyzerNodeInfo.getCodeFlowComplexity(functionNode);
-        if (codeFlowComplexity >= maxReturnTypeInferenceCodeFlowComplexity) {
+        if (codeFlowComplexity >= maxReturnCallSiteTypeInferenceCodeFlowComplexity) {
             return undefined;
         }
         // If an arg hasn't been matched to a specific named parameter,
@@ -15375,11 +15401,21 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // For all remaining source subtypes, attempt to find a dest subtype
             // whose primary type matches.
             if (!isIncompatible) {
-                [...remainingSrcSubtypes].forEach((srcSubtype) => {
-                    const destTypeIndex = remainingDestSubtypes.findIndex((destSubtype) => (0, types_1.isClass)(srcSubtype) &&
-                        (0, types_1.isClass)(destSubtype) &&
-                        types_1.TypeBase.isInstance(srcSubtype) === types_1.TypeBase.isInstance(destSubtype) &&
-                        types_1.ClassType.isSameGenericClass(srcSubtype, destSubtype));
+                (0, typeUtils_1.sortTypes)(remainingSrcSubtypes).forEach((srcSubtype) => {
+                    const destTypeIndex = remainingDestSubtypes.findIndex((destSubtype) => {
+                        if ((0, types_1.isClass)(srcSubtype) &&
+                            (0, types_1.isClass)(destSubtype) &&
+                            types_1.TypeBase.isInstance(srcSubtype) === types_1.TypeBase.isInstance(destSubtype) &&
+                            types_1.ClassType.isSameGenericClass(srcSubtype, destSubtype)) {
+                            return true;
+                        }
+                        if ((0, types_1.isFunction)(srcSubtype) || (0, types_1.isOverloadedFunction)(srcSubtype)) {
+                            if ((0, types_1.isFunction)(destSubtype) || (0, types_1.isOverloadedFunction)(destSubtype)) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    });
                     if (destTypeIndex >= 0) {
                         if (!assignType(remainingDestSubtypes[destTypeIndex], srcSubtype, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                             isIncompatible = true;
@@ -17023,6 +17059,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         removeFalsinessFromType,
         verifyRaiseExceptionType,
         verifyDeleteExpression,
+        validateOverloadedFunctionArguments,
         isAfterNodeReachable,
         isNodeReachable,
         isAsymmetricDescriptorAssignment,