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

package/dist/analyzer/analyzerNodeInfo.d.ts

@@ -1,10 +1,9 @@
-import { ClassNode, ExecutionScopeNode, FunctionNode, LambdaNode, ListComprehensionNode, ModuleNode, NameNode, ParseNode, StringNode } from '../parser/parseNodes';
+import { ClassNode, ExecutionScopeNode, FunctionNode, LambdaNode, ListComprehensionNode, ModuleNode, ParseNode, StringNode } from '../parser/parseNodes';
 import { AnalyzerFileInfo } from './analyzerFileInfo';
 import { FlowNode } from './codeFlowTypes';
 import { Declaration } from './declaration';
 import { ImportResult } from './importResult';
 import { Scope } from './scope';
-import { Symbol } from './symbol';
 export interface DunderAllInfo {
     names: string[];
     stringNodes: StringNode[];
@@ -30,6 +29,4 @@ export declare function getCodeFlowComplexity(node: ExecutionScopeNode): number;
 export declare function setCodeFlowComplexity(node: ExecutionScopeNode, complexity: number): void;
 export declare function getDunderAllInfo(node: ModuleNode): DunderAllInfo | undefined;
 export declare function setDunderAllInfo(node: ModuleNode, names: DunderAllInfo | undefined): void;
-export declare function getTypeParameterSymbol(node: NameNode): Symbol | undefined;
-export declare function setTypeParameterSymbol(node: NameNode, symbol: Symbol): void;
 export declare function isCodeUnreachable(node: ParseNode): boolean;

package/dist/analyzer/analyzerNodeInfo.js

@@ -11,7 +11,7 @@
  * (e.g. hover information).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCodeUnreachable = exports.setTypeParameterSymbol = exports.getTypeParameterSymbol = exports.setDunderAllInfo = exports.getDunderAllInfo = exports.setCodeFlowComplexity = exports.getCodeFlowComplexity = exports.setCodeFlowExpressions = exports.getCodeFlowExpressions = exports.setFileInfo = exports.getFileInfo = exports.setAfterFlowNode = exports.getAfterFlowNode = exports.setFlowNode = exports.getFlowNode = exports.setDeclaration = exports.getDeclaration = exports.setScope = exports.getScope = exports.setImportInfo = exports.getImportInfo = exports.cleanNodeAnalysisInfo = void 0;
+exports.isCodeUnreachable = exports.setDunderAllInfo = exports.getDunderAllInfo = exports.setCodeFlowComplexity = exports.getCodeFlowComplexity = exports.setCodeFlowExpressions = exports.getCodeFlowExpressions = exports.setFileInfo = exports.getFileInfo = exports.setAfterFlowNode = exports.getAfterFlowNode = exports.setFlowNode = exports.getFlowNode = exports.setDeclaration = exports.getDeclaration = exports.setScope = exports.getScope = exports.setImportInfo = exports.getImportInfo = exports.cleanNodeAnalysisInfo = void 0;
 const codeFlowTypes_1 = require("./codeFlowTypes");
 // Cleans out all fields that are added by the analyzer phases
 // (after the post-parse walker).
@@ -122,16 +122,6 @@ function setDunderAllInfo(node, names) {
     analyzerNode.dunderAllInfo = names;
 }
 exports.setDunderAllInfo = setDunderAllInfo;
-function getTypeParameterSymbol(node) {
-    const analyzerNode = node;
-    return analyzerNode.typeParameterSymbol;
-}
-exports.getTypeParameterSymbol = getTypeParameterSymbol;
-function setTypeParameterSymbol(node, symbol) {
-    const analyzerNode = node;
-    analyzerNode.typeParameterSymbol = symbol;
-}
-exports.setTypeParameterSymbol = setTypeParameterSymbol;
 function isCodeUnreachable(node) {
     let curNode = node;
     // Walk up the parse tree until we find a node with

package/dist/analyzer/analyzerNodeInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyzerNodeInfo.js","sourceRoot":"","sources":["../../../../../src/analyzer/analyzerNodeInfo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyzerNodeInfo.js","sourceRoot":"","sources":["../../../../../src/analyzer/analyzerNodeInfo.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAcH,mDAAsD;AAwDtD,8DAA8D;AAC9D,iCAAiC;AACjC,SAAgB,qBAAqB,CAAC,IAAe;IACjD,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,KAAK,CAAC;IAC1B,OAAO,YAAY,CAAC,WAAW,CAAC;IAChC,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC7B,OAAO,YAAY,CAAC,aAAa,CAAC;IAClC,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC7B,OAAO,YAAY,CAAC,mBAAmB,CAAC;IACxC,OAAO,YAAY,CAAC,kBAAkB,CAAC;IACvC,OAAO,YAAY,CAAC,aAAa,CAAC;IAClC,OAAO,YAAY,CAAC,mBAAmB,CAAC;AAC5C,CAAC;AAXD,sDAWC;AAED,SAAgB,aAAa,CAAC,IAAe;IACzC,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,UAAU,CAAC;AACnC,CAAC;AAHD,sCAGC;AAED,SAAgB,aAAa,CAAC,IAAe,EAAE,UAAwB;IACnE,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,UAAU,GAAG,UAAU,CAAC;AACzC,CAAC;AAHD,sCAGC;AAED,SAAgB,QAAQ,CAAC,IAAe;IACpC,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,KAAK,CAAC;AAC9B,CAAC;AAHD,4BAGC;AAED,SAAgB,QAAQ,CAAC,IAAe,EAAE,KAAY;IAClD,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;AAC/B,CAAC;AAHD,4BAGC;AAED,SAAgB,cAAc,CAAC,IAAe;IAC1C,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,WAAW,CAAC;AACpC,CAAC;AAHD,wCAGC;AAED,SAAgB,cAAc,CAAC,IAAe,EAAE,IAAiB;IAC7D,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC;AACpC,CAAC;AAHD,wCAGC;AAED,SAAgB,WAAW,CAAC,IAAe;IACvC,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,QAAQ,CAAC;AACjC,CAAC;AAHD,kCAGC;AAED,SAAgB,WAAW,CAAC,IAAe,EAAE,QAAkB;IAC3D,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;AACrC,CAAC;AAHD,kCAGC;AAED,SAAgB,gBAAgB,CAAC,IAAe;IAC5C,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,aAAa,CAAC;AACtC,CAAC;AAHD,4CAGC;AAED,SAAgB,gBAAgB,CAAC,IAAe,EAAE,QAAkB;IAChE,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,aAAa,GAAG,QAAQ,CAAC;AAC1C,CAAC;AAHD,4CAGC;AAED,SAAgB,WAAW,CAAC,IAAe;IACvC,OAAO,IAAI,CAAC,QAAQ,kCAAyB,EAAE;QAC3C,IAAI,GAAG,IAAI,CAAC,MAAO,CAAC;KACvB;IACD,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,QAAS,CAAC;AAClC,CAAC;AAND,kCAMC;AAED,SAAgB,WAAW,CAAC,IAAgB,EAAE,QAA0B;IACpE,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;AACrC,CAAC;AAHD,kCAGC;AAED,SAAgB,sBAAsB,CAAC,IAAwB;IAC3D,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,mBAAmB,CAAC;AAC5C,CAAC;AAHD,wDAGC;AAED,SAAgB,sBAAsB,CAAC,IAAwB,EAAE,WAAwB;IACrF,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,mBAAmB,GAAG,WAAW,CAAC;AACnD,CAAC;AAHD,wDAGC;AAED,SAAgB,qBAAqB,CAAC,IAAwB;;IAC1D,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,MAAA,YAAY,CAAC,kBAAkB,mCAAI,CAAC,CAAC;AAChD,CAAC;AAHD,sDAGC;AAED,SAAgB,qBAAqB,CAAC,IAAwB,EAAE,UAAkB;IAC9E,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,kBAAkB,GAAG,UAAU,CAAC;AACjD,CAAC;AAHD,sDAGC;AAED,SAAgB,gBAAgB,CAAC,IAAgB;IAC7C,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,OAAO,YAAY,CAAC,aAAa,CAAC;AACtC,CAAC;AAHD,4CAGC;AAED,SAAgB,gBAAgB,CAAC,IAAgB,EAAE,KAAgC;IAC/E,MAAM,YAAY,GAAG,IAAwB,CAAC;IAC9C,YAAY,CAAC,aAAa,GAAG,KAAK,CAAC;AACvC,CAAC;AAHD,4CAGC;AAED,SAAgB,iBAAiB,CAAC,IAAe;IAC7C,IAAI,OAAO,GAA0B,IAAI,CAAC;IAE1C,mDAAmD;IACnD,2BAA2B;IAC3B,OAAO,OAAO,EAAE;QACZ,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,QAAQ,EAAE;YACV,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,yBAAS,CAAC,WAAW,CAAC,CAAC;SACrD;QACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;KAC5B;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAdD,8CAcC"}

package/dist/analyzer/binder.d.ts

@@ -8,7 +8,6 @@ export declare class Binder extends ParseTreeWalker {
     private _deferredBindingTasks;
     private _currentScope;
     private _currentFlowNode;
-    private _activeTypeParams;
     private _targetFunctionDeclaration;
     private _currentBreakTarget;
     private _currentContinueTarget;
@@ -79,7 +78,6 @@ export declare class Binder extends ParseTreeWalker {
     visitPatternCapture(node: PatternCaptureNode): boolean;
     visitPatternMappingExpandEntry(node: PatternMappingExpandEntryNode): boolean;
     private _formatModuleName;
-    private _removeActiveTypeParameters;
     private _getNonClassParentScope;
     private _addSlotsToCurrentScope;
     private _isInListComprehension;

package/dist/analyzer/binder.js

@@ -56,7 +56,6 @@ const docStringUtils_1 = require("./docStringUtils");
 const ParseTreeUtils = __importStar(require("./parseTreeUtils"));
 const parseTreeWalker_1 = require("./parseTreeWalker");
 const scope_1 = require("./scope");
-const scopeUtils_1 = require("./scopeUtils");
 const StaticExpressions = __importStar(require("./staticExpressions"));
 const symbol_1 = require("./symbol");
 const symbolNameUtils_1 = require("./symbolNameUtils");
@@ -71,9 +70,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._moduleSymbolOnly = _moduleSymbolOnly;
         // A queue of deferred analysis operations.
         this._deferredBindingTasks = [];
-        // Tracks the type parameters that are currently active within the
-        // scope and any outer scopes.
-        this._activeTypeParams = new Map();
         // Flow nodes used within try blocks.
         this._currentExceptTargets = [];
         // Flow nodes used within try/finally flows.
@@ -115,7 +111,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // We'll assume that if there is no builtins scope provided, we must be
         // binding the builtins module itself.
         const isBuiltInModule = this._fileInfo.builtinsScope === undefined;
-        this._createNewScope(isBuiltInModule ? 4 /* ScopeType.Builtin */ : 3 /* ScopeType.Module */, this._fileInfo.builtinsScope, () => {
+        this._createNewScope(isBuiltInModule ? 5 /* ScopeType.Builtin */ : 4 /* ScopeType.Module */, this._fileInfo.builtinsScope, 
+        /* proxyScope */ undefined, () => {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
             // Bind implicit names.
@@ -237,11 +234,14 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         // Stash the declaration in the parse node for later access.
         AnalyzerNodeInfo.setDeclaration(node, classDeclaration);
+        let typeParamScope;
         if (node.typeParameters) {
             this.walk(node.typeParameters);
+            typeParamScope = AnalyzerNodeInfo.getScope(node.typeParameters);
         }
         this.walkMultiple(node.arguments);
-        this._createNewScope(2 /* ScopeType.Class */, this._getNonClassParentScope(), () => {
+        this._createNewScope(3 /* ScopeType.Class */, typeParamScope !== null && typeParamScope !== void 0 ? typeParamScope : this._getNonClassParentScope(), 
+        /* proxyScope */ undefined, () => {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             this._addImplicitSymbolToCurrentScope('__doc__', node, 'str | None');
             this._addImplicitSymbolToCurrentScope('__module__', node, 'str');
@@ -257,9 +257,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._dunderSlotsEntries = undefined;
         });
         this._createAssignmentTargetFlowNodes(node.name, /* walkTargets */ false, /* unbound */ false);
-        if (node.typeParameters) {
-            this._removeActiveTypeParameters(node.typeParameters);
-        }
         return false;
     }
     visitFunction(node) {
@@ -288,8 +285,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this.walk(param.defaultValue);
             }
         });
+        let typeParamScope;
         if (node.typeParameters) {
             this.walk(node.typeParameters);
+            typeParamScope = AnalyzerNodeInfo.getScope(node.typeParameters);
         }
         this.walkMultiple(node.decorators);
         node.parameters.forEach((param) => {
@@ -308,7 +307,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         // Don't walk the body of the function until we're done analyzing
         // the current scope.
-        this._createNewScope(1 /* ScopeType.Function */, this._getNonClassParentScope(), () => {
+        this._createNewScope(2 /* ScopeType.Function */, typeParamScope !== null && typeParamScope !== void 0 ? typeParamScope : this._getNonClassParentScope(), 
+        /* proxyScope */ undefined, () => {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
             if (enclosingClass) {
@@ -348,6 +348,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this._currentReturnTarget = this._createBranchLabel();
                 // Walk the statements that make up the function.
                 this.walk(node.suite);
+                this._targetFunctionDeclaration = undefined;
                 // Associate the code flow node at the end of the suite with
                 // the suite.
                 AnalyzerNodeInfo.setAfterFlowNode(node.suite, this._currentFlowNode);
@@ -362,9 +363,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             });
         });
         this._createAssignmentTargetFlowNodes(node.name, /* walkTargets */ false, /* unbound */ false);
-        if (node.typeParameters) {
-            this._removeActiveTypeParameters(node.typeParameters);
-        }
         // We'll walk the child nodes in a deferred manner, so don't walk them now.
         return false;
     }
@@ -378,7 +376,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this.walk(param.defaultValue);
             }
         });
-        this._createNewScope(1 /* ScopeType.Function */, this._getNonClassParentScope(), () => {
+        this._createNewScope(2 /* ScopeType.Function */, this._getNonClassParentScope(), /* proxyScope */ undefined, () => {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             this._deferBinding(() => {
                 // Create a start node for the lambda.
@@ -437,7 +435,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         // Is this an manipulation of dunder all?
-        if (this._currentScope.type === 3 /* ScopeType.Module */ &&
+        if (this._currentScope.type === 4 /* ScopeType.Module */ &&
             node.leftExpression.nodeType === 35 /* ParseNodeType.MemberAccess */ &&
             node.leftExpression.leftExpression.nodeType === 38 /* ParseNodeType.Name */ &&
             node.leftExpression.leftExpression.value === '__all__') {
@@ -503,14 +501,16 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitTypeParameterList(node) {
+        const typeParamScope = new scope_1.Scope(0 /* ScopeType.TypeParameter */, this._getNonClassParentScope(), this._currentScope);
         node.parameters.forEach((param) => {
             if (param.boundExpression) {
                 this.walk(param.boundExpression);
             }
         });
+        const typeParamsSeen = new Set();
         node.parameters.forEach((param) => {
             const name = param.name;
-            const symbol = new symbol_1.Symbol(0 /* SymbolFlags.None */);
+            const symbol = typeParamScope.addSymbol(name.value, 0 /* SymbolFlags.None */);
             const paramDeclaration = {
                 type: 3 /* DeclarationType.TypeParameter */,
                 node: param,
@@ -521,12 +521,11 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             };
             symbol.addDeclaration(paramDeclaration);
             AnalyzerNodeInfo.setDeclaration(name, paramDeclaration);
-            AnalyzerNodeInfo.setTypeParameterSymbol(name, symbol);
-            if (this._activeTypeParams.has(name.value)) {
+            if (typeParamsSeen.has(name.value)) {
                 this._addSyntaxError(localize_1.LocMessage.typeParameterExistingTypeParameter().format({ name: name.value }), name);
             }
             else {
-                this._activeTypeParams.set(name.value, { symbol, scope: this._currentScope });
+                typeParamsSeen.add(name.value);
             }
         });
         node.parameters.forEach((param) => {
@@ -534,13 +533,16 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this.walk(param.defaultExpression);
             }
         });
+        AnalyzerNodeInfo.setScope(node, typeParamScope);
         return false;
     }
     visitTypeAlias(node) {
         this._bindNameToScope(this._currentScope, node.name);
         this.walk(node.name);
+        let typeParamScope;
         if (node.typeParameters) {
             this.walk(node.typeParameters);
+            typeParamScope = AnalyzerNodeInfo.getScope(node.typeParameters);
         }
         const typeAliasDeclaration = {
             type: 4 /* DeclarationType.TypeAlias */,
@@ -558,10 +560,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // Stash the declaration in the parse node for later access.
         AnalyzerNodeInfo.setDeclaration(node, typeAliasDeclaration);
         this._createAssignmentTargetFlowNodes(node.name, /* walkTargets */ true, /* unbound */ false);
+        const prevScope = this._currentScope;
+        this._currentScope = typeParamScope !== null && typeParamScope !== void 0 ? typeParamScope : this._currentScope;
         this.walk(node.expression);
-        if (node.typeParameters) {
-            this._removeActiveTypeParameters(node.typeParameters);
-        }
+        this._currentScope = prevScope;
         return false;
     }
     visitAssignment(node) {
@@ -611,7 +613,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // If we didn't create assignment target flow nodes above, do so now.
         this._createAssignmentTargetFlowNodes(node.leftExpression, /* walkTargets */ true, /* unbound */ false);
         // Is this an assignment to dunder all?
-        if (this._currentScope.type === 3 /* ScopeType.Module */) {
+        if (this._currentScope.type === 4 /* ScopeType.Module */) {
             if ((node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ && node.leftExpression.value === '__all__') ||
                 (node.leftExpression.nodeType === 54 /* ParseNodeType.TypeAnnotation */ &&
                     node.leftExpression.valueExpression.nodeType === 38 /* ParseNodeType.Name */ &&
@@ -655,7 +657,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         // Is this an assignment to dunder slots?
-        if (this._currentScope.type === 2 /* ScopeType.Class */) {
+        if (this._currentScope.type === 3 /* ScopeType.Class */) {
             if ((node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ && node.leftExpression.value === '__slots__') ||
                 (node.leftExpression.nodeType === 54 /* ParseNodeType.TypeAnnotation */ &&
                     node.leftExpression.valueExpression.nodeType === 38 /* ParseNodeType.Name */ &&
@@ -744,7 +746,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // Is this an assignment to dunder all of the form
         // __all__ += <expression>?
         if (node.operator === 1 /* OperatorType.AddEqual */ &&
-            this._currentScope.type === 3 /* ScopeType.Module */ &&
+            this._currentScope.type === 4 /* ScopeType.Module */ &&
             node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ &&
             node.leftExpression.value === '__all__') {
             const expr = node.rightExpression;
@@ -917,19 +919,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     visitName(node) {
         AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
-        const typeParamSymbol = this._activeTypeParams.get(node.value);
-        if (typeParamSymbol) {
-            const bindingType = this._currentScope.getBindingType(node.value);
-            if (bindingType !== 1 /* NameBindingType.Global */) {
-                // See if the type parameter symbol has been shadowed by a
-                // variable within an inner scope.
-                const nameSymbolWithScope = this._currentScope.lookUpSymbolRecursive(node.value);
-                if (!nameSymbolWithScope || !(0, scopeUtils_1.isScopeContainedWithin)(nameSymbolWithScope.scope, typeParamSymbol.scope)) {
-                    AnalyzerNodeInfo.setTypeParameterSymbol(node, typeParamSymbol.symbol);
-                }
-            }
-        }
-        // Name nodes have no children.
         return false;
     }
     visitIndex(node) {
@@ -1274,7 +1263,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
             const symbol = this._bindNameToScope(this._currentScope, symbolNameNode);
             if (symbol &&
-                (this._currentScope.type === 3 /* ScopeType.Module */ || this._currentScope.type === 4 /* ScopeType.Builtin */) &&
+                (this._currentScope.type === 4 /* ScopeType.Module */ || this._currentScope.type === 5 /* ScopeType.Builtin */) &&
                 (!node.alias ||
                     node.module.nameParts.length !== 1 ||
                     node.module.nameParts[0].value !== node.alias.value)) {
@@ -1440,8 +1429,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     // All import statements of the form `from . import x` treat x
                     // as an externally-visible (not hidden) symbol.
                     if (node.module.nameParts.length > 0) {
-                        if (this._currentScope.type === 3 /* ScopeType.Module */ ||
-                            this._currentScope.type === 4 /* ScopeType.Builtin */) {
+                        if (this._currentScope.type === 4 /* ScopeType.Module */ ||
+                            this._currentScope.type === 5 /* ScopeType.Builtin */) {
                             if (!importSymbolNode.alias ||
                                 importSymbolNode.alias.value !== importSymbolNode.name.value) {
                                 if (this._fileInfo.isStubFile || this._fileInfo.isInPyTypedPackage) {
@@ -1655,7 +1644,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         if (node.forIfNodes.length > 0 && node.forIfNodes[0].nodeType === 33 /* ParseNodeType.ListComprehensionFor */) {
             this.walk(node.forIfNodes[0].iterableExpression);
         }
-        this._createNewScope(0 /* ScopeType.ListComprehension */, this._getNonClassParentScope(), () => {
+        this._createNewScope(1 /* ScopeType.ListComprehension */, this._getNonClassParentScope(), 
+        /* proxyScope */ undefined, () => {
             var _a;
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             const falseLabel = this._createBranchLabel();
@@ -1808,29 +1798,17 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     _formatModuleName(node) {
         return '.'.repeat(node.leadingDots) + node.nameParts.map((part) => part.value).join('.');
     }
-    _removeActiveTypeParameters(node) {
-        node.parameters.forEach((typeParamNode) => {
-            const entry = this._activeTypeParams.get(typeParamNode.name.value);
-            if (entry) {
-                const decls = entry.symbol.getDeclarations();
-                (0, debug_1.assert)(decls && decls.length === 1 && decls[0].type === 3 /* DeclarationType.TypeParameter */);
-                if (decls[0].node === typeParamNode) {
-                    this._activeTypeParams.delete(typeParamNode.name.value);
-                }
-            }
-        });
-    }
     _getNonClassParentScope() {
         // We may not be able to use the current scope if it's a class scope.
         // Walk up until we find a non-class scope instead.
         let parentScope = this._currentScope;
-        while (parentScope.type === 2 /* ScopeType.Class */) {
+        while (parentScope.type === 3 /* ScopeType.Class */) {
             parentScope = parentScope.parent;
         }
         return parentScope;
     }
     _addSlotsToCurrentScope(slotNameNodes) {
-        (0, debug_1.assert)(this._currentScope.type === 2 /* ScopeType.Class */);
+        (0, debug_1.assert)(this._currentScope.type === 3 /* ScopeType.Class */);
         let slotsContainsDict = false;
         for (const slotNameNode of slotNameNodes) {
             const slotName = slotNameNode.strings[0].value;
@@ -2662,14 +2640,14 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             let symbol = scope.lookUpSymbol(name);
             if (!symbol) {
                 symbol = scope.addSymbol(name, 1 /* SymbolFlags.InitiallyUnbound */ | 4 /* SymbolFlags.ClassMember */);
-                if (this._currentScope.type === 3 /* ScopeType.Module */ || this._currentScope.type === 4 /* ScopeType.Builtin */) {
+                if (this._currentScope.type === 4 /* ScopeType.Module */ || this._currentScope.type === 5 /* ScopeType.Builtin */) {
                     if ((0, symbolNameUtils_1.isPrivateOrProtectedName)(name)) {
                         if ((0, symbolNameUtils_1.isPrivateName)(name)) {
                             // Private names are obscured, so they are always externally hidden.
                             symbol.setIsExternallyHidden();
                         }
                         else if (this._fileInfo.isStubFile || this._fileInfo.isInPyTypedPackage) {
-                            if (this._currentScope.type === 4 /* ScopeType.Builtin */) {
+                            if (this._currentScope.type === 5 /* ScopeType.Builtin */) {
                                 // Don't include private-named symbols in the builtin scope.
                                 symbol.setIsExternallyHidden();
                             }
@@ -2741,7 +2719,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             if (isInitiallyUnbound) {
                 symbolFlags |= 1 /* SymbolFlags.InitiallyUnbound */;
             }
-            if (this._currentScope.type === 2 /* ScopeType.Class */) {
+            if (this._currentScope.type === 3 /* ScopeType.Class */) {
                 symbolFlags |= 4 /* SymbolFlags.ClassMember */;
             }
             if (this._fileInfo.isStubFile && (0, symbolNameUtils_1.isPrivateOrProtectedName)(nameValue)) {
@@ -2753,12 +2731,12 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         return symbol;
     }
-    _createNewScope(scopeType, parentScope, callback) {
+    _createNewScope(scopeType, parentScope, proxyScope, callback) {
         const prevScope = this._currentScope;
-        const newScope = new scope_1.Scope(scopeType, parentScope);
+        const newScope = new scope_1.Scope(scopeType, parentScope, proxyScope);
         this._currentScope = newScope;
         // If this scope is an execution scope, allocate a new reference map.
-        const isExecutionScope = scopeType === 4 /* ScopeType.Builtin */ || scopeType === 3 /* ScopeType.Module */ || scopeType === 1 /* ScopeType.Function */;
+        const isExecutionScope = scopeType === 5 /* ScopeType.Builtin */ || scopeType === 4 /* ScopeType.Module */ || scopeType === 2 /* ScopeType.Function */;
         const prevExpressions = this._currentScopeCodeFlowExpressions;
         if (isExecutionScope) {
             this._currentScopeCodeFlowExpressions = new Set();
@@ -3256,7 +3234,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._deferredBindingTasks.push({
             scope: this._currentScope,
             codeFlowExpressions: this._currentScopeCodeFlowExpressions,
-            activeTypeParams: new Map(this._activeTypeParams),
             callback,
         });
     }
@@ -3266,7 +3243,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // Reset the state
             this._currentScope = nextItem.scope;
             this._currentScopeCodeFlowExpressions = nextItem.codeFlowExpressions;
-            this._activeTypeParams = nextItem.activeTypeParams;
             nextItem.callback();
         }
     }
@@ -3371,7 +3347,7 @@ class DummyScopeGenerator extends parseTreeWalker_1.ParseTreeWalker {
         this._currentScope = currentScope;
     }
     visitClass(node) {
-        const newScope = this._createNewScope(2 /* ScopeType.Class */, () => {
+        const newScope = this._createNewScope(3 /* ScopeType.Class */, () => {
             this.walk(node.suite);
         });
         if (!AnalyzerNodeInfo.getScope(node)) {
@@ -3380,7 +3356,7 @@ class DummyScopeGenerator extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitFunction(node) {
-        const newScope = this._createNewScope(1 /* ScopeType.Function */, () => {
+        const newScope = this._createNewScope(2 /* ScopeType.Function */, () => {
             this.walk(node.suite);
         });
         if (!AnalyzerNodeInfo.getScope(node)) {