@zzzen/pyright-internal 1.2.0-dev.20231224 → 1.2.0-dev.20231231

package/dist/analyzer/typeEvaluator.js

@@ -706,7 +706,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // Make sure the resulting type is assignable to the expected type.
                 if (!assignType(inferenceContext.expectedType, typeResult.type, diag, 
                 /* destTypeVarContext */ undefined, 
-                /* srcTypeVarContext */ undefined, 512 /* AssignTypeFlags.IgnoreTypeVarScope */)) {
+                /* srcTypeVarContext */ undefined, 1024 /* AssignTypeFlags.IgnoreTypeVarScope */)) {
                     typeResult.typeErrors = true;
                     typeResult.expectedTypeDiagAddendum = diag;
                     diag.addTextRange(node);
@@ -1398,15 +1398,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return undefined;
     }
-    function getBoundMagicMethod(classType, memberName, selfType, recursionCount = 0) {
+    function getBoundMagicMethod(classType, memberName, selfType, diag, recursionCount = 0) {
         if (recursionCount > types_1.maxTypeRecursionCount) {
             return undefined;
         }
         recursionCount++;
         const boundMethodResult = getTypeOfBoundMember(
         /* errorNode */ undefined, classType, memberName, 
-        /* usage */ undefined, 
-        /* diag */ undefined, 16 /* MemberAccessFlags.SkipInstanceMembers */ | 512 /* MemberAccessFlags.SkipAttributeAccessOverride */, selfType, recursionCount);
+        /* usage */ undefined, diag, 16 /* MemberAccessFlags.SkipInstanceMembers */ | 512 /* MemberAccessFlags.SkipAttributeAccessOverride */, selfType, recursionCount);
         if (!boundMethodResult || boundMethodResult.typeErrors) {
             return undefined;
         }
@@ -1414,7 +1413,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             return boundMethodResult.type;
         }
         if ((0, types_1.isClassInstance)(boundMethodResult.type)) {
-            return getBoundMagicMethod(boundMethodResult.type, '__call__', selfType !== null && selfType !== void 0 ? selfType : types_1.ClassType.cloneAsInstance(classType), recursionCount);
+            return getBoundMagicMethod(boundMethodResult.type, '__call__', selfType !== null && selfType !== void 0 ? selfType : types_1.ClassType.cloneAsInstance(classType), diag, recursionCount);
         }
         if ((0, types_1.isAnyOrUnknown)(boundMethodResult.type)) {
             return (0, typeUtils_1.getUnknownTypeForCallable)();
@@ -1574,10 +1573,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const kwSeparatorIndex = functionType.details.parameters.findIndex((param) => param.category === 1 /* ParameterCategory.ArgsList */);
         // Add a keyword separator if necessary.
         if (kwSeparatorIndex < 0) {
-            types_1.FunctionType.addParameter(newFunction, {
-                category: 1 /* ParameterCategory.ArgsList */,
-                type: types_1.AnyType.create(),
-            });
+            types_1.FunctionType.addKeywordOnlyParameterSeparator(newFunction);
         }
         tdEntries.forEach((tdEntry, name) => {
             types_1.FunctionType.addParameter(newFunction, {
@@ -1738,6 +1734,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         specializedType.typeArguments.length > 0) {
                         return specializedType.typeArguments[0];
                     }
+                    return types_1.UnknownType.create();
                 }
             }
             if (errorNode) {
@@ -2970,9 +2967,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     // Verify that the name does not refer to a (non type alias) variable.
                     if (effectiveTypeInfo.includesVariableDecl && !type.typeAliasInfo) {
                         let isAllowedTypeForVariable = (0, types_1.isTypeVar)(type) || (0, typeUtils_1.isTypeAliasPlaceholder)(type);
-                        if ((0, types_1.isClass)(type) && !type.includeSubclasses && !symbol.hasTypedDeclarations()) {
+                        if ((0, types_1.isClass)(type) &&
+                            !type.includeSubclasses &&
+                            !symbol.hasTypedDeclarations() &&
+                            types_1.ClassType.isValidTypeAliasClass(type)) {
                             // This check exempts class types that are created by calling
-                            // NewType, NamedTuple, and by invoking a metaclass directly.
+                            // NewType, NamedTuple, etc.
                             isAllowedTypeForVariable = true;
                         }
                         // Disable for assignments in the typings.pyi file, since it defines special forms.
@@ -4530,10 +4530,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             hasDeclaredType: true,
                         });
                     });
-                    (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, functionType, diag, typeVarContext, 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
+                    types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
+                    (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, functionType, diag, typeVarContext, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
                 }
                 else if ((0, types_1.isParamSpec)(typeArgType)) {
-                    (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, (0, typeUtils_1.convertToInstance)(typeArgType), diag, typeVarContext, 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
+                    (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, (0, typeUtils_1.convertToInstance)(typeArgType), diag, typeVarContext, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
                 }
                 else if ((0, types_1.isInstantiableClass)(typeArgType) && types_1.ClassType.isBuiltIn(typeArgType, 'Concatenate')) {
                     const concatTypeArgs = typeArgType.typeArguments;
@@ -4541,12 +4542,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if (concatTypeArgs && concatTypeArgs.length > 0) {
                         concatTypeArgs.forEach((typeArg, index) => {
                             if (index === concatTypeArgs.length - 1) {
-                                // Add a position-only separator
-                                types_1.FunctionType.addParameter(functionType, {
-                                    category: 0 /* ParameterCategory.Simple */,
-                                    isNameSynthesized: false,
-                                    type: types_1.UnknownType.create(),
-                                });
+                                types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
                                 if ((0, types_1.isParamSpec)(typeArg)) {
                                     functionType.details.paramSpec = typeArg;
                                 }
@@ -4566,7 +4562,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             }
                         });
                     }
-                    (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, functionType, diag, typeVarContext, 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
+                    (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, functionType, diag, typeVarContext, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
                 }
                 else if ((0, typeUtils_1.isEllipsisType)(typeArgType)) {
                     const functionType = types_1.FunctionType.createSynthesizedInstance('', 65536 /* FunctionTypeFlags.ParamSpecValue */ | 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */);
@@ -4606,7 +4602,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         }
                     }
                 }
-                (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, typeArgType, diag, typeVarContext, 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
+                (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, typeArgType, diag, typeVarContext, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
             }
         });
         if (!diag.isEmpty()) {
@@ -5251,6 +5247,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const diag = new diagnostic_1.DiagnosticAddendum();
             diag.addMessage(localize_1.Localizer.DiagnosticAddendum.useTupleInstead());
             addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.tupleInAnnotation() + diag.getString(), node);
+            return { type: types_1.UnknownType.create() };
         }
         if ((flags & 128 /* EvaluatorFlags.ExpectingInstantiableType */) !== 0 &&
             node.expressions.length === 0 &&
@@ -5552,11 +5549,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (lambdaParams.length > 0) {
             const lastParam = lambdaParams[lambdaParams.length - 1];
             if (lastParam.category === 0 /* ParameterCategory.Simple */ && !lastParam.name) {
-                types_1.FunctionType.addParameter(expectedType, {
-                    category: 0 /* ParameterCategory.Simple */,
-                    name: '',
-                    type: types_1.UnknownType.create(),
-                });
+                types_1.FunctionType.addPositionOnlyParameterSeparator(expectedType);
             }
         }
         function getLambdaType() {
@@ -6542,8 +6535,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         if (types_1.ClassType.isBuiltIn(expandedCallType)) {
             const className = (_a = expandedCallType.aliasName) !== null && _a !== void 0 ? _a : expandedCallType.details.name;
-            // Handle the 'type' call specially.
-            if (expandedCallType.details.name === 'type') {
+            // Handle a call to a metaclass explicitly.
+            if ((0, typeUtils_1.isInstantiableMetaclass)(expandedCallType)) {
                 if (expandedCallType.typeArguments && expandedCallType.isTypeArgumentExplicit) {
                     addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.objectNotCallable().format({
                         type: printType(expandedCallType),
@@ -6552,9 +6545,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 // Validate the constructor arguments.
                 (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext);
-                if (argList.length === 1) {
-                    // The one-parameter form of "type" returns the class
-                    // for the specified object.
+                // The one-parameter form of "type" returns the class
+                // for the specified object.
+                if (expandedCallType.details.name === 'type' && argList.length === 1) {
                     const argType = getTypeOfArgument(argList[0]).type;
                     const returnType = (0, typeUtils_1.mapSubtypes)(argType, (subtype) => {
                         if ((0, types_1.isClassInstance)(subtype) ||
@@ -6570,9 +6563,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     return { returnType };
                 }
                 if (argList.length >= 2) {
-                    // The two-parameter form of "type" returns a new class type
+                    // The two-parameter form of a call to a metaclass returns a new class
                     // built from the specified base types.
-                    return { returnType: createType(errorNode, argList) || types_1.AnyType.create() };
+                    return {
+                        returnType: createClassFromMetaclass(errorNode, argList, expandedCallType) || types_1.AnyType.create(),
+                    };
                 }
                 // If the parameter to type() is not statically known,
                 // fall back to Any.
@@ -7646,9 +7641,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         const effectiveReturnType = getFunctionEffectiveReturnType(type);
         let effectiveExpectedType = inferenceContext.expectedType;
-        let effectiveFlags = 1024 /* AssignTypeFlags.PopulatingExpectedType */;
+        let effectiveFlags = 2048 /* AssignTypeFlags.PopulatingExpectedType */;
         if ((0, typeUtils_1.containsLiteralType)(effectiveExpectedType, /* includeTypeArgs */ true)) {
-            effectiveFlags |= 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
+            effectiveFlags |= 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
         }
         // If the expected type is a union, we don't know which type is expected.
         // We may or may not be able to make use of the expected type. We'll evaluate
@@ -7704,7 +7699,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         effectiveExpectedType = (0, typeUtils_1.applySolvedTypeVars)(genericReturnType, tempTypeVarContext, {
                             unknownIfNotFound: true,
                         });
-                        effectiveFlags |= 2048 /* AssignTypeFlags.SkipPopulateUnknownExpectedType */;
+                        effectiveFlags |= 4096 /* AssignTypeFlags.SkipPopulateUnknownExpectedType */;
                     }
                 }
             }
@@ -8710,7 +8705,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (errorNode.parent.nodeType !== 3 /* ParseNodeType.Assignment */ ||
             errorNode.parent.rightExpression !== errorNode ||
             errorNode.parent.leftExpression.nodeType !== 38 /* ParseNodeType.Name */) {
-            addError(localize_1.Localizer.Diagnostic.typeAliasTypeMustBeAssigned(), errorNode);
+            addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasTypeMustBeAssigned(), errorNode);
             return undefined;
         }
         const nameNode = errorNode.parent.leftExpression;
@@ -8718,11 +8713,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (firstArg.valueExpression && firstArg.valueExpression.nodeType === 48 /* ParseNodeType.StringList */) {
             const typeAliasName = firstArg.valueExpression.strings.map((s) => s.value).join('');
             if (typeAliasName !== nameNode.value) {
-                addError(localize_1.Localizer.Diagnostic.typeAliasTypeNameMismatch(), firstArg.valueExpression);
+                addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasTypeNameMismatch(), firstArg.valueExpression);
             }
         }
         else {
-            addError(localize_1.Localizer.Diagnostic.typeAliasTypeNameArg(), firstArg.valueExpression || errorNode);
+            addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasTypeNameArg(), firstArg.valueExpression || errorNode);
             return undefined;
         }
         let valueExpr;
@@ -8777,12 +8772,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             });
             if (!isTypeParamListValid) {
-                addError(localize_1.Localizer.Diagnostic.typeAliasTypeParamInvalid(), typeParamsExpr);
+                addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasTypeParamInvalid(), typeParamsExpr);
                 return undefined;
             }
         }
         return getTypeOfTypeAliasCommon(nameNode, nameNode, valueExpr, 
-        /* isPep695Syntax */ false, 
+        /* isPep695Syntax */ true, 
         /* typeParamNodes */ undefined, () => typeParameters);
     }
     function getBooleanValue(node) {
@@ -8794,7 +8789,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 return true;
             }
         }
-        addError(localize_1.Localizer.Diagnostic.expectedBoolLiteral(), node);
+        addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.expectedBoolLiteral(), node);
         return false;
     }
     function getFunctionFullName(functionNode, moduleName, functionName) {
@@ -8814,7 +8809,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // in the Python specification: The static type checker will treat
     // the new type as if it were a subclass of the original type.
     function createNewType(errorNode, argList) {
-        var _a;
+        var _a, _b, _c;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
         let className = '';
         if (argList.length !== 2) {
@@ -8831,26 +8826,36 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.newTypeBadName(), (_a = argList[0].node) !== null && _a !== void 0 ? _a : errorNode);
             return undefined;
         }
+        if (((_b = errorNode.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 3 /* ParseNodeType.Assignment */ &&
+            errorNode.parent.leftExpression.nodeType === 38 /* ParseNodeType.Name */ &&
+            errorNode.parent.leftExpression.value !== className) {
+            addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.newTypeNameMismatch(), errorNode.parent.leftExpression);
+            return undefined;
+        }
         let baseClass = getTypeOfArgumentExpectingType(argList[1]).type;
         let isBaseClassAny = false;
         if ((0, types_1.isAnyOrUnknown)(baseClass)) {
             if (objectType && (0, types_1.isClassInstance)(objectType)) {
                 baseClass = types_1.ClassType.cloneAsInstantiable(objectType);
             }
+            addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.newTypeAnyOrUnknown(), (_c = argList[1].node) !== null && _c !== void 0 ? _c : errorNode);
             isBaseClassAny = true;
         }
         if (!(0, types_1.isInstantiableClass)(baseClass)) {
             addError(localize_1.Localizer.Diagnostic.newTypeNotAClass(), argList[1].node || errorNode);
             return undefined;
         }
-        if (types_1.ClassType.isProtocolClass(baseClass)) {
+        if (types_1.ClassType.isProtocolClass(baseClass) || types_1.ClassType.isTypedDictClass(baseClass)) {
             addError(localize_1.Localizer.Diagnostic.newTypeProtocolClass(), argList[1].node || errorNode);
         }
         else if (baseClass.literalValue !== undefined) {
             addError(localize_1.Localizer.Diagnostic.newTypeLiteral(), argList[1].node || errorNode);
         }
+        else if (types_1.ClassType.isNewTypeClass(baseClass)) {
+            addError(localize_1.Localizer.Diagnostic.newTypeNewTypeClass(), argList[1].node || errorNode);
+        }
         let classFlags = baseClass.details.flags & ~(1 /* ClassTypeFlags.BuiltInClass */ | 2 /* ClassTypeFlags.SpecialBuiltIn */);
-        classFlags |= 4096 /* ClassTypeFlags.Final */;
+        classFlags |= 4096 /* ClassTypeFlags.Final */ | 268435456 /* ClassTypeFlags.NewTypeClass */ | 536870912 /* ClassTypeFlags.ValidTypeAliasClass */;
         const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.fileUri, classFlags, ParseTreeUtils.getTypeSourceId(errorNode), 
         /* declaredMetaclass */ undefined, baseClass.details.effectiveMetaclass);
         classType.details.baseClasses.push(isBaseClassAny ? types_1.AnyType.create() : baseClass);
@@ -8887,7 +8892,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return classType;
     }
     // Implements the semantics of the multi-parameter variant of the "type" call.
-    function createType(errorNode, argList) {
+    function createClassFromMetaclass(errorNode, argList, metaclass) {
         const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
         const arg0Type = getTypeOfArgument(argList[0]).type;
         if (!(0, types_1.isClassInstance)(arg0Type) || !types_1.ClassType.isBuiltIn(arg0Type, 'str')) {
@@ -8895,10 +8900,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         const className = arg0Type.literalValue || '_';
         const arg1Type = getTypeOfArgument(argList[1]).type;
+        // TODO - properly handle case where tuple of base classes is provided.
         if (!(0, types_1.isClassInstance)(arg1Type) || !(0, typeUtils_1.isTupleClass)(arg1Type) || arg1Type.tupleTypeArguments === undefined) {
             return undefined;
         }
-        const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.fileUri, 0 /* ClassTypeFlags.None */, ParseTreeUtils.getTypeSourceId(errorNode), 
+        const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.fileUri, 536870912 /* ClassTypeFlags.ValidTypeAliasClass */, ParseTreeUtils.getTypeSourceId(errorNode), 
         /* declaredMetaclass */ undefined, arg1Type.details.effectiveMetaclass);
         arg1Type.tupleTypeArguments.forEach((typeArg) => {
             const specializedType = makeTopLevelTypeVarsConcrete(typeArg.type);
@@ -8936,14 +8942,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return { type: type !== null && type !== void 0 ? type : types_1.UnknownType.create() };
     }
-    function getTypeOfMagicMethodCall(objType, methodName, argList, errorNode, inferenceContext) {
+    function getTypeOfMagicMethodCall(objType, methodName, argList, errorNode, inferenceContext, diag) {
         let magicMethodSupported = true;
         // Create a helper lambda for object subtypes.
         const handleSubtype = (subtype) => {
             let magicMethodType;
             const concreteSubtype = makeTopLevelTypeVarsConcrete(subtype);
             if ((0, types_1.isClass)(concreteSubtype)) {
-                magicMethodType = getBoundMagicMethod(concreteSubtype, methodName, subtype);
+                magicMethodType = getBoundMagicMethod(concreteSubtype, methodName, subtype, diag);
             }
             if (magicMethodType) {
                 const functionArgs = argList.map((arg) => {
@@ -9283,7 +9289,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     mappingType = (0, typeUtils_1.selfSpecializeClass)(mappingType);
                     if (assignType(types_1.ClassType.cloneAsInstance(mappingType), unexpandedType, 
                     /* diag */ undefined, mappingTypeVarContext, 
-                    /* srcTypeVarContext */ undefined, 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */)) {
+                    /* srcTypeVarContext */ undefined, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */)) {
                         const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(mappingType, mappingTypeVarContext);
                         const typeArgs = specializedMapping.typeArguments;
                         if (typeArgs && typeArgs.length >= 2) {
@@ -9711,11 +9717,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if (paramsArePositionOnly &&
                     !isImplicitPositionOnlyParam &&
                     functionType.details.parameters.length > 0) {
-                    // Insert an implicit "position-only parameter" separator.
-                    types_1.FunctionType.addParameter(functionType, {
-                        category: 0 /* ParameterCategory.Simple */,
-                        type: types_1.UnknownType.create(),
-                    });
+                    types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
                 }
                 if (!isImplicitPositionOnlyParam) {
                     paramsArePositionOnly = false;
@@ -9732,11 +9734,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             types_1.FunctionType.addParameter(functionType, functionParam);
         });
         if (paramsArePositionOnly && functionType.details.parameters.length > 0) {
-            // Insert an implicit "position-only parameter" separator.
-            types_1.FunctionType.addParameter(functionType, {
-                category: 0 /* ParameterCategory.Simple */,
-                type: types_1.UnknownType.create(),
-            });
+            types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
         }
         let typeErrors = false;
         // If we're speculatively evaluating the lambda, create another speculative
@@ -10047,12 +10045,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     });
                 });
                 if (typeList.length > 0) {
-                    // Add a positional-only separator to the end of the parameter list.
-                    types_1.FunctionType.addParameter(functionType, {
-                        category: 0 /* ParameterCategory.Simple */,
-                        isNameSynthesized: false,
-                        type: types_1.UnknownType.create(),
-                    });
+                    types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
                 }
             }
             else if ((0, typeUtils_1.isEllipsisType)(typeArgs[0].type)) {
@@ -10068,12 +10061,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if (concatTypeArgs && concatTypeArgs.length > 0) {
                         concatTypeArgs.forEach((typeArg, index) => {
                             if (index === concatTypeArgs.length - 1) {
-                                // Add a position-only separator
-                                types_1.FunctionType.addParameter(functionType, {
-                                    category: 0 /* ParameterCategory.Simple */,
-                                    isNameSynthesized: false,
-                                    type: types_1.UnknownType.create(),
-                                });
+                                types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
                                 if ((0, types_1.isParamSpec)(typeArg)) {
                                     functionType.details.paramSpec = typeArg;
                                 }
@@ -10308,14 +10296,25 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 name: classType.details.name,
             }), (_a = typeArgs[0].node) !== null && _a !== void 0 ? _a : errorNode);
         }
-        const enclosingClass = ParseTreeUtils.getEnclosingClass(errorNode);
+        let enclosingClass = ParseTreeUtils.getEnclosingClass(errorNode);
+        // If `Self` appears anywhere outside of the class body (e.g. a decorator,
+        // base class list, metaclass argument, type parameter list), it is
+        // considered illegal.
+        if (enclosingClass && !ParseTreeUtils.isNodeContainedWithin(errorNode, enclosingClass.suite)) {
+            enclosingClass = undefined;
+        }
         const enclosingClassTypeResult = enclosingClass ? getTypeOfClass(enclosingClass) : undefined;
         if (!enclosingClassTypeResult) {
-            if ((flags & 256 /* EvaluatorFlags.ExpectingTypeAnnotation */) !== 0) {
+            if ((flags & (256 /* EvaluatorFlags.ExpectingTypeAnnotation */ | 128 /* EvaluatorFlags.ExpectingInstantiableType */)) !== 0) {
                 addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.selfTypeContext(), errorNode);
             }
             return types_1.UnknownType.create();
         }
+        else if ((0, typeUtils_1.isInstantiableMetaclass)(enclosingClassTypeResult.classType)) {
+            // If `Self` appears within a metaclass, it is considered illegal.
+            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.selfTypeMetaclass(), errorNode);
+            return types_1.UnknownType.create();
+        }
         const enclosingFunction = ParseTreeUtils.getEnclosingFunction(errorNode);
         if (enclosingFunction) {
             const functionInfo = (0, decorators_1.getFunctionInfoFromDecorators)(evaluatorInterface, enclosingFunction, 
@@ -10485,6 +10484,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (!typeArgs || typeArgs.length === 0) {
             return { type: types_1.AnyType.create() };
         }
+        if (typeArgs[0].typeList) {
+            addError(localize_1.Localizer.Diagnostic.typeArgListNotAllowed(), typeArgs[0].node);
+        }
         return {
             type: types_1.TypeBase.cloneForAnnotated(typeArgs[0].type),
             isReadOnly: typeArgs[0].isReadOnly,
@@ -11094,11 +11096,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             setSymbolResolutionPartialType(typeAliasSymbol.symbol, typeAliasDecl, typeAliasTypeVar);
         }
         const typeParameters = getTypeParamCallback();
-        typeAliasTypeVar.details.recursiveTypeParameters = typeParameters;
-        if (!isLegalTypeAliasExpressionForm(valueNode)) {
-            addDiagnostic(AnalyzerNodeInfo.getFileInfo(valueNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasIllegalExpressionForm(), valueNode);
-        }
-        const aliasTypeResult = getTypeOfExpressionExpectingType(valueNode, { allowForwardReference: true });
+        typeAliasTypeVar.details.recursiveTypeParameters = typeParameters || [];
+        const aliasTypeResult = getTypeOfExpressionExpectingType(valueNode, {
+            allowForwardReference: true,
+            enforceTypeAnnotationRules: true,
+        });
         let isIncomplete = false;
         let aliasType = aliasTypeResult.type;
         if (aliasTypeResult.isIncomplete) {
@@ -11363,6 +11365,22 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         }
                     }
                 }
+                else if (types_1.ClassType.isTypedDictClass(classType)) {
+                    if (arg.name.value === 'total') {
+                        // The "total" and "readonly" parameters apply only for TypedDict classes.
+                        // PEP 589 specifies that the parameter must be either True or False.
+                        const constArgValue = (0, staticExpressions_1.evaluateStaticBoolExpression)(arg.valueExpression, fileInfo.executionEnvironment, fileInfo.definedConstants);
+                        if (constArgValue === undefined) {
+                            addError(localize_1.Localizer.Diagnostic.typedDictBoolParam().format({ name: arg.name.value }), arg.valueExpression);
+                        }
+                        else if (arg.name.value === 'total' && !constArgValue) {
+                            classType.details.flags |= 256 /* ClassTypeFlags.CanOmitDictValues */;
+                        }
+                    }
+                    else {
+                        addError(localize_1.Localizer.Diagnostic.typedDictInitsubclassParameter().format({ name: arg.name.value }), arg);
+                    }
+                }
                 else if (arg.name.value === 'metaclass') {
                     if (metaclassNode) {
                         addError(localize_1.Localizer.Diagnostic.metaclassDuplicate(), arg);
@@ -11371,17 +11389,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         metaclassNode = arg.valueExpression;
                     }
                 }
-                else if (types_1.ClassType.isTypedDictClass(classType) && arg.name.value === 'total') {
-                    // The "total" and "readonly" parameters apply only for TypedDict classes.
-                    // PEP 589 specifies that the parameter must be either True or False.
-                    const constArgValue = (0, staticExpressions_1.evaluateStaticBoolExpression)(arg.valueExpression, fileInfo.executionEnvironment, fileInfo.definedConstants);
-                    if (constArgValue === undefined) {
-                        addError(localize_1.Localizer.Diagnostic.typedDictBoolParam().format({ name: arg.name.value }), arg.valueExpression);
-                    }
-                    else if (arg.name.value === 'total' && !constArgValue) {
-                        classType.details.flags |= 256 /* ClassTypeFlags.CanOmitDictValues */;
-                    }
-                }
                 else {
                     // Collect arguments that will be passed to the `__init_subclass__`
                     // method described in PEP 487.
@@ -12272,11 +12279,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if (paramsArePositionOnly &&
                     !isImplicitPositionOnlyParam &&
                     functionType.details.parameters.length > firstNonClsSelfParamIndex) {
-                    // Insert an implicit "position-only parameter" separator.
-                    types_1.FunctionType.addParameter(functionType, {
-                        category: 0 /* ParameterCategory.Simple */,
-                        type: types_1.UnknownType.create(),
-                    });
+                    types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
                 }
                 if (!isImplicitPositionOnlyParam) {
                     paramsArePositionOnly = false;
@@ -12315,11 +12318,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         });
         if (paramsArePositionOnly && functionType.details.parameters.length > firstNonClsSelfParamIndex) {
-            // Insert an implicit "position-only parameter" separator.
-            types_1.FunctionType.addParameter(functionType, {
-                category: 0 /* ParameterCategory.Simple */,
-                type: types_1.UnknownType.create(),
-            });
+            types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
         }
         // Update the types for the nodes associated with the parameters.
         paramTypes.forEach((paramType, index) => {
@@ -12915,7 +12914,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const additionalHelp = new diagnostic_1.DiagnosticAddendum();
             if ((0, types_1.isClass)(subtype)) {
                 let enterType = getTypeOfMagicMethodCall(subtype, enterMethodName, [], node.expression, 
-                /* inferenceContext */ undefined);
+                /* inferenceContext */ undefined, additionalHelp.createAddendum());
                 if (enterType) {
                     // For "async while", an implicit "await" is performed.
                     if (isAsync) {
@@ -14505,7 +14504,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
             // Determine if this node is within a quoted type annotation.
             const isWithinTypeAnnotation = ParseTreeUtils.isWithinTypeAnnotation(node, !(0, analyzerFileInfo_1.isAnnotationEvaluationPostponed)(AnalyzerNodeInfo.getFileInfo(node)));
-            const allowForwardReferences = isWithinTypeAnnotation || fileInfo.isStubFile;
+            // Determine if this is part of a "type" statement.
+            const isWithinTypeAliasStatement = !!ParseTreeUtils.getParentNodeOfType(node, 77 /* ParseNodeType.TypeAlias */);
+            const allowForwardReferences = isWithinTypeAnnotation || isWithinTypeAliasStatement || fileInfo.isStubFile;
             let symbol;
             const typeParamSymbol = AnalyzerNodeInfo.getTypeParameterSymbol(node);
             if (typeParamSymbol) {
@@ -16057,16 +16058,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             let errorSource;
             let includeDiagAddendum = true;
             if (variance === 3 /* Variance.Covariant */) {
-                effectiveFlags = flags | 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
+                effectiveFlags = flags | 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
                 errorSource = localize_1.Localizer.DiagnosticAddendum.typeVarIsCovariant;
             }
             else if (variance === 4 /* Variance.Contravariant */) {
                 effectiveFlags =
-                    (flags ^ 2 /* AssignTypeFlags.ReverseTypeVarMatching */) | 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
+                    (flags ^ 2 /* AssignTypeFlags.ReverseTypeVarMatching */) | 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
                 errorSource = localize_1.Localizer.DiagnosticAddendum.typeVarIsContravariant;
             }
             else {
-                effectiveFlags = flags | 1 /* AssignTypeFlags.EnforceInvariance */ | 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
+                effectiveFlags = flags | 1 /* AssignTypeFlags.EnforceInvariance */ | 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
                 errorSource = localize_1.Localizer.DiagnosticAddendum.typeVarIsInvariant;
                 // Omit the diagnostic addendum for the invariant case because it's obvious
                 // why two types are not the same.
@@ -16189,7 +16190,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         // Strip flags we don't want to propagate to other calls.
         const originalFlags = flags;
-        flags &= ~64 /* AssignTypeFlags.AllowBoolTypeGuard */;
+        flags &= ~128 /* AssignTypeFlags.AllowBoolTypeGuard */;
         // Before performing any other checks, see if the dest type is a
         // TypeVar that we are attempting to match.
         if ((0, types_1.isTypeVar)(destType)) {
@@ -16414,7 +16415,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // PEP 544 says that if the dest type is a type[Proto] class,
                 // the source must be a "concrete" (non-protocol) class.
                 if (types_1.ClassType.isProtocolClass(destType) &&
-                    (flags & 8192 /* AssignTypeFlags.IgnoreProtocolAssignmentCheck */) === 0) {
+                    (flags & 16384 /* AssignTypeFlags.IgnoreProtocolAssignmentCheck */) === 0) {
                     if (types_1.ClassType.isProtocolClass(expandedSrcType) &&
                         (0, types_1.isInstantiableClass)(srcType) &&
                         !srcType.includeSubclasses) {
@@ -16466,7 +16467,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             else if (types_1.ClassType.isBuiltIn(destType, 'TypeGuard')) {
                 // All the source to be a "bool".
-                if ((originalFlags & 64 /* AssignTypeFlags.AllowBoolTypeGuard */) !== 0) {
+                if ((originalFlags & 128 /* AssignTypeFlags.AllowBoolTypeGuard */) !== 0) {
                     if ((0, types_1.isClassInstance)(srcType) && types_1.ClassType.isBuiltIn(srcType, 'bool')) {
                         return true;
                     }
@@ -16560,7 +16561,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             let concreteSrcType = makeTopLevelTypeVarsConcrete(srcType);
             if ((0, types_1.isClassInstance)(concreteSrcType)) {
                 const boundMethod = getBoundMagicMethod(concreteSrcType, '__call__', 
-                /* selfType */ undefined, recursionCount);
+                /* selfType */ undefined, 
+                /* diag */ undefined, recursionCount);
                 if (boundMethod) {
                     concreteSrcType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundMethod);
                 }
@@ -16680,6 +16682,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         // Sort the subtypes so we have a deterministic order for unions.
         let sortedSrcTypes = (0, typeUtils_1.sortTypes)(srcType.subtypes);
+        let matchedSomeSubtypes = false;
         // Handle the case where the source and dest are both unions. Try
         // to eliminate as many exact type matches between the src and dest.
         if ((0, types_1.isUnion)(destType)) {
@@ -16706,6 +16709,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     const srcTypeIndex = remainingSrcSubtypes.findIndex((srcSubtype) => (0, types_1.isTypeSame)(srcSubtype, destSubtype, {}, recursionCount));
                     if (srcTypeIndex >= 0) {
                         remainingSrcSubtypes.splice(srcTypeIndex, 1);
+                        matchedSomeSubtypes = true;
                     }
                     else {
                         remainingDestSubtypes.push(destSubtype);
@@ -16743,7 +16747,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     return false;
                 });
                 if (destTypeIndex >= 0) {
-                    if (!assignType(remainingDestSubtypes[destTypeIndex], srcSubtype, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                    if (assignType(remainingDestSubtypes[destTypeIndex], srcSubtype, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                        // Note that we have matched at least one subtype indicating
+                        // there is at least some overlap.
+                        matchedSomeSubtypes = true;
+                    }
+                    else {
                         canUseFastPath = false;
                     }
                     remainingDestSubtypes.splice(destTypeIndex, 1);
@@ -16781,7 +16790,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     sortedSrcTypes = remainingSrcSubtypes;
                 }
                 else if (remainingSrcSubtypes.length === 0) {
-                    if ((flags & 1024 /* AssignTypeFlags.PopulatingExpectedType */) !== 0) {
+                    if ((flags & 2048 /* AssignTypeFlags.PopulatingExpectedType */) !== 0) {
                         // If we're populating an expected type, try not to leave
                         // any TypeVars unsolved. Assign the full type to the remaining
                         // dest TypeVars.
@@ -16804,6 +16813,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (canUseFastPath) {
                 return true;
             }
+            // If we're looking for type overlaps and at least one type was matched,
+            // consider it as assignable.
+            if ((flags & 32 /* AssignTypeFlags.PartialOverloadOverlapCheck */) !== 0 && matchedSomeSubtypes) {
+                return true;
+            }
         }
         let isIncompatible = false;
         sortedSrcTypes.forEach((subtype) => {
@@ -16822,8 +16836,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     isIncompatible = true;
                 }
             }
+            else {
+                matchedSomeSubtypes = true;
+            }
         }, /* sortSubtypes */ true);
         if (isIncompatible) {
+            // If we're looking for type overlaps and at least one type was matched,
+            // consider it as assignable.
+            if ((flags & 32 /* AssignTypeFlags.PartialOverloadOverlapCheck */) !== 0 && matchedSomeSubtypes) {
+                return true;
+            }
             diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeAssignmentMismatch().format(printSrcDestTypes(srcType, destType)));
             return false;
         }
@@ -17061,7 +17083,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
         }
-        const boundMethod = getBoundMagicMethod(objType, '__call__', /* selfType */ undefined, recursionCount);
+        const boundMethod = getBoundMagicMethod(objType, '__call__', 
+        /* selfType */ undefined, 
+        /* diag */ undefined, recursionCount);
         if (boundMethod) {
             return (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundMethod);
         }
@@ -17094,7 +17118,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // Is an additional specialization step required?
         if (doSpecializationStep) {
             assignType(specializedSrcType, specializedDestType, 
-            /* diag */ undefined, srcTypeVarContext, destTypeVarContext, (flags ^ 2 /* AssignTypeFlags.ReverseTypeVarMatching */) | 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */, recursionCount);
+            /* diag */ undefined, srcTypeVarContext, destTypeVarContext, (flags ^ 2 /* AssignTypeFlags.ReverseTypeVarMatching */) | 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */, recursionCount);
             if ((flags & 2 /* AssignTypeFlags.ReverseTypeVarMatching */) === 0) {
                 specializedDestType = (0, typeUtils_1.applySolvedTypeVars)(destType, destTypeVarContext);
             }
@@ -17208,9 +17232,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     function assignFunction(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         let canAssign = true;
-        const checkReturnType = (flags & 32 /* AssignTypeFlags.SkipFunctionReturnTypeCheck */) === 0;
+        const checkReturnType = (flags & 64 /* AssignTypeFlags.SkipFunctionReturnTypeCheck */) === 0;
         const reverseMatching = (flags & 2 /* AssignTypeFlags.ReverseTypeVarMatching */) !== 0;
-        flags &= ~32 /* AssignTypeFlags.SkipFunctionReturnTypeCheck */;
+        flags &= ~64 /* AssignTypeFlags.SkipFunctionReturnTypeCheck */;
         destType = (0, typeUtils_1.removeParamSpecVariadicsFromFunction)(destType);
         srcType = (0, typeUtils_1.removeParamSpecVariadicsFromFunction)(srcType);
         const destParamDetails = (0, parameterUtils_1.getParameterListDetails)(destType);
@@ -17234,17 +17258,24 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const destParamType = destParam.type;
             const destParamName = (_c = destParam.param.name) !== null && _c !== void 0 ? _c : '';
             const srcParamName = (_d = srcParam.param.name) !== null && _d !== void 0 ? _d : '';
-            if (destParamName && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(destParamName) && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(srcParamName)) {
+            if (destParamName) {
                 const isDestPositionalOnly = destParam.source === parameterUtils_1.ParameterSource.PositionOnly;
                 if (!isDestPositionalOnly &&
                     destParam.param.category !== 1 /* ParameterCategory.ArgsList */ &&
-                    srcParam.param.category !== 1 /* ParameterCategory.ArgsList */ &&
-                    destParamName !== srcParamName) {
-                    diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.Localizer.DiagnosticAddendum.functionParamName().format({
-                        srcName: srcParamName,
-                        destName: destParamName,
-                    }));
-                    canAssign = false;
+                    srcParam.param.category !== 1 /* ParameterCategory.ArgsList */) {
+                    if (srcParam.source === parameterUtils_1.ParameterSource.PositionOnly) {
+                        diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.Localizer.DiagnosticAddendum.functionParamPositionOnly().format({
+                            name: destParamName,
+                        }));
+                        canAssign = false;
+                    }
+                    else if (destParamName !== srcParamName) {
+                        diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.Localizer.DiagnosticAddendum.functionParamName().format({
+                            srcName: srcParamName,
+                            destName: destParamName,
+                        }));
+                        canAssign = false;
+                    }
                 }
             }
             if (!!destParam.param.hasDefault &&
@@ -17269,7 +17300,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (!assignFunctionParameter(destParamType, srcParamType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                 // Handle the special case where the source parameter is a synthesized
                 // TypeVar for "self" or "cls".
-                if ((flags & 256 /* AssignTypeFlags.SkipSelfClsTypeCheck */) === 0 ||
+                if ((flags & 512 /* AssignTypeFlags.SkipSelfClsTypeCheck */) === 0 ||
                     !(0, types_1.isTypeVar)(srcParamType) ||
                     !srcParamType.details.isSynthesized) {
                     canAssign = false;
@@ -17599,7 +17630,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // solver to retain literals.
                 if (srcType.details.declaredReturnType &&
                     (0, typeUtils_1.containsLiteralType)(srcType.details.declaredReturnType, /* includeTypeArgs */ true)) {
-                    effectiveFlags |= 128 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
+                    effectiveFlags |= 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */;
                 }
                 if ((0, types_1.isNever)(srcReturnType)) {
                     // We'll allow any function that returns NoReturn to match any
@@ -18343,7 +18374,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
             else if (!assignType(memberTypeFirstParamType, firstParamType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), typeVarContext, 
-            /* srcTypeVarContext */ undefined, 4096 /* AssignTypeFlags.AllowUnspecifiedTypeArguments */, recursionCount)) {
+            /* srcTypeVarContext */ undefined, 8192 /* AssignTypeFlags.AllowUnspecifiedTypeArguments */, recursionCount)) {
                 if (memberTypeFirstParam.name &&
                     !memberTypeFirstParam.isNameSynthesized &&
                     memberTypeFirstParam.hasDeclaredType) {
@@ -18415,6 +18446,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             case 31 /* ParseNodeType.List */:
             case 45 /* ParseNodeType.Set */:
                 return false;
+            case 7 /* ParseNodeType.BinaryOperation */:
+                return (node.operator === 6 /* OperatorType.BitwiseOr */ &&
+                    isLegalTypeAliasExpressionForm(node.leftExpression) &&
+                    isLegalTypeAliasExpressionForm(node.rightExpression));
+            case 24 /* ParseNodeType.Index */:
+                return isLegalTypeAliasExpressionForm(node.baseExpression);
+            case 35 /* ParseNodeType.MemberAccess */:
+                return isLegalTypeAliasExpressionForm(node.leftExpression);
         }
         return true;
     }