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

package/dist/analyzer/packageTypeVerifier.js

@@ -165,7 +165,7 @@ class PackageTypeVerifier {
                 };
                 const parseTree = sourceFile.getParserOutput().parseTree;
                 const moduleScope = (0, scopeUtils_1.getScopeForNode)(parseTree);
-                this._getPublicSymbolsInSymbolTable(publicSymbols, alternateSymbolNames, module, module.name, moduleScope.symbolTable, 3 /* ScopeType.Module */);
+                this._getPublicSymbolsInSymbolTable(publicSymbols, alternateSymbolNames, module, module.name, moduleScope.symbolTable, 4 /* ScopeType.Module */);
             }
         }
     }
@@ -185,7 +185,7 @@ class PackageTypeVerifier {
                         const classDecl = typedDecls.find((decl) => decl.type === 6 /* DeclarationType.Class */);
                         if (classDecl) {
                             if ((0, types_1.isInstantiableClass)(symbolType)) {
-                                this._getPublicSymbolsInSymbolTable(publicSymbols, alternateSymbolNames, module, fullName, types_1.ClassType.getSymbolTable(symbolType), 2 /* ScopeType.Class */);
+                                this._getPublicSymbolsInSymbolTable(publicSymbols, alternateSymbolNames, module, fullName, types_1.ClassType.getSymbolTable(symbolType), 3 /* ScopeType.Class */);
                             }
                         }
                     }
@@ -235,7 +235,7 @@ class PackageTypeVerifier {
             if (sourceFile) {
                 const parseTree = sourceFile.getParserOutput().parseTree;
                 const moduleScope = (0, scopeUtils_1.getScopeForNode)(parseTree);
-                this._getTypeKnownStatusForSymbolTable(report, module.name, moduleScope.symbolTable, 3 /* ScopeType.Module */, publicSymbols);
+                this._getTypeKnownStatusForSymbolTable(report, module.name, moduleScope.symbolTable, 4 /* ScopeType.Module */, publicSymbols);
             }
             else {
                 report.generalDiagnostics.push(new diagnostic_1.Diagnostic(0 /* DiagnosticCategory.Error */, `Could not bind file "${modulePath}"`, (0, textRange_1.getEmptyRange)()));
@@ -590,7 +590,7 @@ class PackageTypeVerifier {
                     // Allow params (like "self" and "cls") to skip declarations because
                     // we're able to synthesize these.
                     const isSynthesized = index === 0 &&
-                        (symbolInfo === null || symbolInfo === void 0 ? void 0 : symbolInfo.scopeType) === 2 /* ScopeType.Class */ &&
+                        (symbolInfo === null || symbolInfo === void 0 ? void 0 : symbolInfo.scopeType) === 3 /* ScopeType.Class */ &&
                         (types_1.FunctionType.isClassMethod(type) ||
                             types_1.FunctionType.isInstanceMethod(type) ||
                             types_1.FunctionType.isConstructorMethod(type));
@@ -682,12 +682,12 @@ class PackageTypeVerifier {
             typeKnownStatus: 0 /* TypeKnownStatus.Known */,
             referenceCount: 1,
             diagnostics: [],
-            scopeType: 2 /* ScopeType.Class */,
+            scopeType: 3 /* ScopeType.Class */,
         };
         this._addSymbol(report, symbolInfo);
         // Determine whether the class has a proper doc string.
         this._reportMissingClassDocstring(symbolInfo, type, report);
-        const symbolTableTypeKnownStatus = this._getTypeKnownStatusForSymbolTable(report, type.details.fullName, types_1.ClassType.getSymbolTable(type), 2 /* ScopeType.Class */, publicSymbols, (name, symbol) => {
+        const symbolTableTypeKnownStatus = this._getTypeKnownStatusForSymbolTable(report, type.details.fullName, types_1.ClassType.getSymbolTable(type), 3 /* ScopeType.Class */, publicSymbols, (name, symbol) => {
             // If the symbol within this class is lacking a type declaration,
             // see if we can find a same-named symbol in a parent class with
             // a type declaration.
@@ -758,13 +758,13 @@ class PackageTypeVerifier {
             typeKnownStatus: 0 /* TypeKnownStatus.Known */,
             referenceCount: 1,
             diagnostics: [],
-            scopeType: 3 /* ScopeType.Module */,
+            scopeType: 4 /* ScopeType.Module */,
         };
         // Add the symbol for the module if the name isn't relative.
         if (!type.moduleName.startsWith('.')) {
             this._addSymbol(report, symbolInfo);
         }
-        const symbolTableTypeKnownStatus = this._getTypeKnownStatusForSymbolTable(report, type.moduleName, type.fields, 3 /* ScopeType.Module */, publicSymbols);
+        const symbolTableTypeKnownStatus = this._getTypeKnownStatusForSymbolTable(report, type.moduleName, type.fields, 4 /* ScopeType.Module */, publicSymbols);
         symbolInfo.typeKnownStatus = this._updateKnownStatusIfWorse(symbolInfo.typeKnownStatus, symbolTableTypeKnownStatus);
         return symbolInfo;
     }
@@ -920,7 +920,7 @@ class PackageTypeVerifier {
         return undefined;
     }
     _isSymbolTypeImplied(scopeType, name) {
-        if (scopeType === 2 /* ScopeType.Class */) {
+        if (scopeType === 3 /* ScopeType.Class */) {
             const knownClassSymbols = [
                 '__class__',
                 '__dict__',
@@ -933,7 +933,7 @@ class PackageTypeVerifier {
             ];
             return knownClassSymbols.some((sym) => sym === name);
         }
-        else if (scopeType === 3 /* ScopeType.Module */) {
+        else if (scopeType === 4 /* ScopeType.Module */) {
             const knownModuleSymbols = [
                 '__all__',
                 '__author__',

package/dist/analyzer/parseTreeUtils.d.ts

@@ -11,6 +11,10 @@ export declare const enum PrintExpressionFlags {
     ForwardDeclarations = 1,
     DoNotLimitStringLength = 2
 }
+export interface EvaluationScopeInfo {
+    node: EvaluationScopeNode;
+    useProxyScope?: boolean;
+}
 export declare function getNodeDepth(node: ParseNode): number;
 export declare function findNodeByPosition(node: ParseNode, position: Position, lines: TextRangeCollection<TextRange>): ParseNode | undefined;
 export declare function findNodeByOffset(node: ParseNode, offset: number): ParseNode | undefined;
@@ -32,8 +36,8 @@ export declare function getEnclosingLambda(node: ParseNode): LambdaNode | undefi
 export declare function getEnclosingClassOrFunction(node: ParseNode): FunctionNode | ClassNode | undefined;
 export declare function getEnclosingSuiteOrModule(node: ParseNode, stopAtFunction?: boolean, stopAtLambda?: boolean): SuiteNode | ModuleNode | undefined;
 export declare function getEvaluationNodeForAssignmentExpression(node: AssignmentExpressionNode): LambdaNode | FunctionNode | ModuleNode | ClassNode | undefined;
-export declare function getEvaluationScopeNode(node: ParseNode): EvaluationScopeNode;
-export declare function getTypeVarScopeNode(node: ParseNode): TypeParameterScopeNode;
+export declare function getEvaluationScopeNode(node: ParseNode): EvaluationScopeInfo;
+export declare function getTypeVarScopeNode(node: ParseNode): TypeParameterScopeNode | undefined;
 export declare function getExecutionScopeNode(node: ParseNode): ExecutionScopeNode;
 export declare function getTypeAnnotationNode(node: ParseNode): TypeAnnotationNode | undefined;
 export declare function getArgumentsByRuntimeOrder(node: CallNode): ArgumentNode[];
@@ -52,7 +56,6 @@ export declare function isWithinDefaultParamInitializer(node: ParseNode): boolea
 export declare function isWithinTypeAnnotation(node: ParseNode, requireQuotedAnnotation: boolean): boolean;
 export declare function isWithinAnnotationComment(node: ParseNode): boolean;
 export declare function isWithinLoop(node: ParseNode): boolean;
-export declare function isWithinTryBlock(node: ParseNode, treatWithAsTryBlock?: boolean): boolean;
 export declare function isWithinAssertExpression(node: ParseNode): boolean;
 export declare function getDocString(statements: StatementNode[]): string | undefined;
 export declare function isDocString(statementList: StatementListNode): boolean;

package/dist/analyzer/parseTreeUtils.js

@@ -31,8 +31,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnclosingParameter = exports.CallNodeWalker = exports.NameNodeWalker = exports.isAssignmentToDefaultsFollowingNamedTuple = exports.isDocString = exports.getDocString = exports.isWithinAssertExpression = exports.isWithinTryBlock = exports.isWithinLoop = exports.isWithinAnnotationComment = exports.isWithinTypeAnnotation = exports.isWithinDefaultParamInitializer = exports.isPartialMatchingExpression = exports.isMatchingExpression = exports.containsAwaitNode = exports.isSuiteEmpty = exports.isNodeContainedWithinNodeType = exports.getParentAnnotationNode = exports.getParentNodeOfType = exports.isNodeContainedWithin = exports.isRequiredAllowedForAssignmentTarget = exports.isClassVarAllowedForAssignmentTarget = exports.isFinalAllowedForAssignmentTarget = exports.getArgumentsByRuntimeOrder = exports.getTypeAnnotationNode = exports.getExecutionScopeNode = exports.getTypeVarScopeNode = exports.getEvaluationScopeNode = exports.getEvaluationNodeForAssignmentExpression = exports.getEnclosingSuiteOrModule = exports.getEnclosingClassOrFunction = exports.getEnclosingLambda = exports.getEnclosingFunctionEvaluationScope = exports.getEnclosingFunction = exports.getEnclosingClassOrModule = exports.getEnclosingModule = exports.getEnclosingClass = exports.getEnclosingSuite = exports.getDecoratorForName = exports.getCallForName = exports.printOperator = exports.printExpression = exports.printArgument = exports.getTypeSourceId = exports.getClassFullName = exports.isCompliantWithNodeRangeRules = exports.findNodeByOffset = exports.findNodeByPosition = exports.getNodeDepth = exports.PrintExpressionFlags = void 0;
-exports.isSimpleDefault = exports.checkDecorator = exports.getTypeVarScopesForNode = exports.getScopeIdForNode = exports.getVariableDocStringNode = exports.operatorSupportsChaining = exports.isValidLocationForFutureImport = exports.isUnannotatedFunction = exports.isBlankLine = exports.getFullStatementRange = exports.getStringValueRange = exports.getStringNodeValueRange = exports.isLastNameOfDottedName = exports.isFirstNameOfDottedName = exports.getFirstNameOfDottedName = exports.getDottedName = exports.getDecoratorName = exports.getDottedNameWithGivenNodeAsLastName = exports.getFirstAncestorOrSelf = exports.getFirstAncestorOrSelfOfKind = exports.getAncestorsIncludingSelf = exports.isLastNameOfModuleName = exports.isFromImportAlias = exports.isFromImportName = exports.isFromImportModuleName = exports.isImportAlias = exports.isImportModuleName = exports.getTypeAnnotationForParameter = exports.isFunctionSuiteEmpty = exports.getFileInfoFromNode = exports.getModuleNode = exports.isWriteAccess = exports.printParseNodeType = exports.getCommentsAtTokenIndex = exports.findTokenAfter = exports.getIndexOfTokenOverlapping = exports.getTokenOverlapping = exports.getTokenAt = exports.getTokenAtIndex = exports.isWhitespace = exports.getTokenAtLeft = exports.getTokenIndexAtLeft = exports.getCallNodeAndActiveParameterIndex = void 0;
+exports.getCallNodeAndActiveParameterIndex = exports.getEnclosingParameter = exports.CallNodeWalker = exports.NameNodeWalker = exports.isAssignmentToDefaultsFollowingNamedTuple = exports.isDocString = exports.getDocString = exports.isWithinAssertExpression = exports.isWithinLoop = exports.isWithinAnnotationComment = exports.isWithinTypeAnnotation = exports.isWithinDefaultParamInitializer = exports.isPartialMatchingExpression = exports.isMatchingExpression = exports.containsAwaitNode = exports.isSuiteEmpty = exports.isNodeContainedWithinNodeType = exports.getParentAnnotationNode = exports.getParentNodeOfType = exports.isNodeContainedWithin = exports.isRequiredAllowedForAssignmentTarget = exports.isClassVarAllowedForAssignmentTarget = exports.isFinalAllowedForAssignmentTarget = exports.getArgumentsByRuntimeOrder = exports.getTypeAnnotationNode = exports.getExecutionScopeNode = exports.getTypeVarScopeNode = exports.getEvaluationScopeNode = exports.getEvaluationNodeForAssignmentExpression = exports.getEnclosingSuiteOrModule = exports.getEnclosingClassOrFunction = exports.getEnclosingLambda = exports.getEnclosingFunctionEvaluationScope = exports.getEnclosingFunction = exports.getEnclosingClassOrModule = exports.getEnclosingModule = exports.getEnclosingClass = exports.getEnclosingSuite = exports.getDecoratorForName = exports.getCallForName = exports.printOperator = exports.printExpression = exports.printArgument = exports.getTypeSourceId = exports.getClassFullName = exports.isCompliantWithNodeRangeRules = exports.findNodeByOffset = exports.findNodeByPosition = exports.getNodeDepth = exports.PrintExpressionFlags = void 0;
+exports.isSimpleDefault = exports.checkDecorator = exports.getTypeVarScopesForNode = exports.getScopeIdForNode = exports.getVariableDocStringNode = exports.operatorSupportsChaining = exports.isValidLocationForFutureImport = exports.isUnannotatedFunction = exports.isBlankLine = exports.getFullStatementRange = exports.getStringValueRange = exports.getStringNodeValueRange = exports.isLastNameOfDottedName = exports.isFirstNameOfDottedName = exports.getFirstNameOfDottedName = exports.getDottedName = exports.getDecoratorName = exports.getDottedNameWithGivenNodeAsLastName = exports.getFirstAncestorOrSelf = exports.getFirstAncestorOrSelfOfKind = exports.getAncestorsIncludingSelf = exports.isLastNameOfModuleName = exports.isFromImportAlias = exports.isFromImportName = exports.isFromImportModuleName = exports.isImportAlias = exports.isImportModuleName = exports.getTypeAnnotationForParameter = exports.isFunctionSuiteEmpty = exports.getFileInfoFromNode = exports.getModuleNode = exports.isWriteAccess = exports.printParseNodeType = exports.getCommentsAtTokenIndex = exports.findTokenAfter = exports.getIndexOfTokenOverlapping = exports.getTokenOverlapping = exports.getTokenAt = exports.getTokenAtIndex = exports.isWhitespace = exports.getTokenAtLeft = exports.getTokenIndexAtLeft = void 0;
 const AnalyzerNodeInfo = __importStar(require("../analyzer/analyzerNodeInfo"));
 const core_1 = require("../common/core");
 const debug_1 = require("../common/debug");
@@ -624,7 +624,7 @@ exports.getEnclosingFunction = getEnclosingFunction;
 // (for example), it will be considered part of its parent node rather than
 // the class node.
 function getEnclosingFunctionEvaluationScope(node) {
-    let curNode = getEvaluationScopeNode(node);
+    let curNode = getEvaluationScopeNode(node).node;
     while (curNode) {
         if (curNode.nodeType === 28 /* ParseNodeType.Function */) {
             return curNode;
@@ -632,7 +632,7 @@ function getEnclosingFunctionEvaluationScope(node) {
         if (curNode.nodeType === 10 /* ParseNodeType.Class */ || !curNode.parent) {
             return undefined;
         }
-        curNode = getEvaluationScopeNode(curNode.parent);
+        curNode = getEvaluationScopeNode(curNode.parent).node;
     }
     return undefined;
 }
@@ -694,7 +694,7 @@ function getEvaluationNodeForAssignmentExpression(node) {
     // target within a list comprehension is contained within a lambda,
     // function or module, but not a class.
     let sawListComprehension = false;
-    let curNode = getEvaluationScopeNode(node);
+    let curNode = getEvaluationScopeNode(node).node;
     while (curNode !== undefined) {
         switch (curNode.nodeType) {
             case 28 /* ParseNodeType.Function */:
@@ -705,7 +705,7 @@ function getEvaluationNodeForAssignmentExpression(node) {
                 return sawListComprehension ? undefined : curNode;
             case 32 /* ParseNodeType.ListComprehension */:
                 sawListComprehension = true;
-                curNode = getEvaluationScopeNode(curNode.parent);
+                curNode = getEvaluationScopeNode(curNode.parent).node;
                 break;
             default:
                 return undefined;
@@ -721,26 +721,56 @@ function getEvaluationScopeNode(node) {
     let prevPrevNode;
     let curNode = node;
     let isParamNameNode = false;
+    let isParamDefaultNode = false;
     while (curNode) {
-        if (curNode.nodeType === 41 /* ParseNodeType.Parameter */ && prevNode === curNode.name) {
-            // Note that we passed through a parameter name node.
-            isParamNameNode = true;
+        if (curNode.nodeType === 41 /* ParseNodeType.Parameter */) {
+            if (prevNode === curNode.name) {
+                // Note that we passed through a parameter name node.
+                isParamNameNode = true;
+            }
+            else if (prevNode === curNode.defaultValue) {
+                // Note that we passed through a parameter default value node.
+                isParamDefaultNode = true;
+            }
         }
         // We found a scope associated with this node. In most cases,
         // we'll return this scope, but in a few cases we need to return
         // the enclosing scope instead.
         switch (curNode.nodeType) {
+            case 76 /* ParseNodeType.TypeParameterList */: {
+                return { node: curNode, useProxyScope: true };
+            }
             case 28 /* ParseNodeType.Function */: {
+                if (!prevNode) {
+                    break;
+                }
+                // Decorators are always evaluated outside of the function scope.
+                if (curNode.decorators.some((decorator) => decorator === prevNode)) {
+                    break;
+                }
                 if (curNode.parameters.some((param) => param === prevNode)) {
+                    // Default argument expressions are evaluated outside of the function scope.
+                    if (isParamDefaultNode) {
+                        break;
+                    }
                     if (isParamNameNode) {
                         if ((0, analyzerNodeInfo_1.getScope)(curNode) !== undefined) {
-                            return curNode;
+                            return { node: curNode };
                         }
                     }
                 }
-                else if (prevNode === curNode.suite) {
+                if (prevNode === curNode.suite) {
                     if ((0, analyzerNodeInfo_1.getScope)(curNode) !== undefined) {
-                        return curNode;
+                        return { node: curNode };
+                    }
+                }
+                // All other nodes in the function are evaluated in the context
+                // of the type parameter scope if it's present. Otherwise,
+                // they are evaluated within the function's parent scope.
+                if (curNode.typeParameters) {
+                    const scopeNode = curNode.typeParameters;
+                    if ((0, analyzerNodeInfo_1.getScope)(scopeNode) !== undefined) {
+                        return { node: scopeNode, useProxyScope: true };
                     }
                 }
                 break;
@@ -749,21 +779,37 @@ function getEvaluationScopeNode(node) {
                 if (curNode.parameters.some((param) => param === prevNode)) {
                     if (isParamNameNode) {
                         if ((0, analyzerNodeInfo_1.getScope)(curNode) !== undefined) {
-                            return curNode;
+                            return { node: curNode };
                         }
                     }
                 }
                 else if (!prevNode || prevNode === curNode.expression) {
                     if ((0, analyzerNodeInfo_1.getScope)(curNode) !== undefined) {
-                        return curNode;
+                        return { node: curNode };
                     }
                 }
                 break;
             }
             case 10 /* ParseNodeType.Class */: {
+                if (!prevNode) {
+                    break;
+                }
+                // Decorators are always evaluated outside of the class scope.
+                if (curNode.decorators.some((decorator) => decorator === prevNode)) {
+                    break;
+                }
                 if (prevNode === curNode.suite) {
                     if ((0, analyzerNodeInfo_1.getScope)(curNode) !== undefined) {
-                        return curNode;
+                        return { node: curNode };
+                    }
+                }
+                // All other nodes in the class are evaluated in the context
+                // of the type parameter scope if it's present. Otherwise,
+                // they are evaluated within the class' parent scope.
+                if (curNode.typeParameters) {
+                    const scopeNode = curNode.typeParameters;
+                    if ((0, analyzerNodeInfo_1.getScope)(scopeNode) !== undefined) {
+                        return { node: scopeNode, useProxyScope: true };
                     }
                 }
                 break;
@@ -776,14 +822,23 @@ function getEvaluationScopeNode(node) {
                         curNode.forIfNodes[0].nodeType === 33 /* ParseNodeType.ListComprehensionFor */ &&
                         curNode.forIfNodes[0].iterableExpression === prevPrevNode;
                     if (!isFirstIterableExpr) {
-                        return curNode;
+                        return { node: curNode };
+                    }
+                }
+                break;
+            }
+            case 77 /* ParseNodeType.TypeAlias */: {
+                if (prevNode === curNode.expression && curNode.typeParameters) {
+                    const scopeNode = curNode.typeParameters;
+                    if ((0, analyzerNodeInfo_1.getScope)(scopeNode) !== undefined) {
+                        return { node: scopeNode };
                     }
                 }
                 break;
             }
             case 36 /* ParseNodeType.Module */: {
                 if ((0, analyzerNodeInfo_1.getScope)(curNode) !== undefined) {
-                    return curNode;
+                    return { node: curNode };
                 }
                 break;
             }
@@ -797,7 +852,7 @@ function getEvaluationScopeNode(node) {
 }
 exports.getEvaluationScopeNode = getEvaluationScopeNode;
 // Returns the parse node corresponding to the function, class, or type alias
-// that contains the specified typeVar reference.
+// that potentially provides the scope for a type parameter.
 function getTypeVarScopeNode(node) {
     let prevNode;
     let curNode = node;
@@ -828,13 +883,13 @@ exports.getTypeVarScopeNode = getTypeVarScopeNode;
 // Returns the parse node corresponding to the scope that is used
 // for executing the code referenced in the specified node.
 function getExecutionScopeNode(node) {
-    let evaluationScope = getEvaluationScopeNode(node);
+    let evaluationScope = getEvaluationScopeNode(node).node;
     // Classes are not considered execution scope because they are executed
     // within the context of their containing module or function. Likewise, list
     // comprehensions are executed within their container.
     while (evaluationScope.nodeType === 10 /* ParseNodeType.Class */ ||
         evaluationScope.nodeType === 32 /* ParseNodeType.ListComprehension */) {
-        evaluationScope = getEvaluationScopeNode(evaluationScope.parent);
+        evaluationScope = getEvaluationScopeNode(evaluationScope.parent).node;
     }
     return evaluationScope;
 }
@@ -1196,32 +1251,6 @@ function isWithinLoop(node) {
     return false;
 }
 exports.isWithinLoop = isWithinLoop;
-function isWithinTryBlock(node, treatWithAsTryBlock = false) {
-    let curNode = node;
-    let prevNode;
-    while (curNode) {
-        switch (curNode.nodeType) {
-            case 53 /* ParseNodeType.Try */: {
-                return curNode.trySuite === prevNode;
-            }
-            case 58 /* ParseNodeType.With */: {
-                if (treatWithAsTryBlock && curNode.suite === prevNode) {
-                    return true;
-                }
-                break;
-            }
-            case 28 /* ParseNodeType.Function */:
-            case 36 /* ParseNodeType.Module */:
-            case 10 /* ParseNodeType.Class */: {
-                return false;
-            }
-        }
-        prevNode = curNode;
-        curNode = curNode.parent;
-    }
-    return false;
-}
-exports.isWithinTryBlock = isWithinTryBlock;
 function isWithinAssertExpression(node) {
     let curNode = node;
     let prevNode;