@zzzen/pyright-internal 1.2.0-dev.2022-07-02 → 1.2.0-dev.20220703

package/dist/analyzer/aliasDeclarationUtils.js

@@ -22,7 +22,7 @@ function resolveAliasDeclaration(importLookup, declaration, resolveLocalNames, a
     let privatePyTypedImported;
     let privatePyTypedImporter;
     while (true) {
-        if (curDeclaration.type !== 6 /* Alias */ || !curDeclaration.symbolName) {
+        if (curDeclaration.type !== 8 /* Alias */ || !curDeclaration.symbolName) {
             return {
                 declaration: curDeclaration,
                 isPrivate,
@@ -110,7 +110,7 @@ function resolveAliasDeclaration(importLookup, declaration, resolveLocalNames, a
             // the module is foo, and the foo.__init__.py file contains the statement
             // "from foo import bar", we want to import the foo/bar.py submodule.
             if (curDeclaration.path === declaration.path &&
-                curDeclaration.type === 6 /* Alias */ &&
+                curDeclaration.type === 8 /* Alias */ &&
                 curDeclaration.submoduleFallback) {
                 return resolveAliasDeclaration(importLookup, curDeclaration.submoduleFallback, resolveLocalNames, allowExternallyHiddenAccess);
             }

package/dist/analyzer/analyzerNodeInfo.d.ts

@@ -1,9 +1,10 @@
-import { ClassNode, ExecutionScopeNode, FunctionNode, LambdaNode, ListComprehensionNode, ModuleNode, ParseNode, StringNode } from '../parser/parseNodes';
+import { ClassNode, ExecutionScopeNode, FunctionNode, LambdaNode, ListComprehensionNode, ModuleNode, NameNode, 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[];
@@ -29,4 +30,6 @@ 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.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.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;
 const codeFlowTypes_1 = require("./codeFlowTypes");
 // Cleans out all fields that are added by the analyzer phases
 // (after the post-parse walker).
@@ -25,6 +25,7 @@ function cleanNodeAnalysisInfo(node) {
     delete analyzerNode.codeFlowExpressions;
     delete analyzerNode.codeFlowComplexity;
     delete analyzerNode.dunderAllInfo;
+    delete analyzerNode.typeParameterSymbol;
 }
 exports.cleanNodeAnalysisInfo = cleanNodeAnalysisInfo;
 function getImportInfo(node) {
@@ -121,6 +122,16 @@ 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":";AAAA;;;;;;;;;;GAUG;;;AAcH,mDAAsD;AAoDtD,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;AACtC,CAAC;AAVD,sDAUC;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,oBAAyB,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"}
+{"version":3,"file":"analyzerNodeInfo.js","sourceRoot":"","sources":["../../../src/analyzer/analyzerNodeInfo.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/binder.d.ts

@@ -1,4 +1,4 @@
-import { AssertNode, AssignmentExpressionNode, AssignmentNode, AugmentedAssignmentNode, AwaitNode, BinaryOperationNode, BreakNode, CallNode, ClassNode, ContinueNode, DelNode, ExceptNode, ForNode, FunctionNode, GlobalNode, IfNode, ImportAsNode, ImportFromNode, IndexNode, LambdaNode, ListComprehensionNode, MatchNode, MemberAccessNode, ModuleNameNode, ModuleNode, NameNode, NonlocalNode, ParseNode, PatternAsNode, PatternCaptureNode, PatternMappingExpandEntryNode, RaiseNode, ReturnNode, SuiteNode, TernaryNode, TryNode, TypeAnnotationNode, UnaryOperationNode, WhileNode, WithNode, YieldFromNode, YieldNode } from '../parser/parseNodes';
+import { AssertNode, AssignmentExpressionNode, AssignmentNode, AugmentedAssignmentNode, AwaitNode, BinaryOperationNode, BreakNode, CallNode, ClassNode, ContinueNode, DelNode, ExceptNode, ForNode, FunctionNode, GlobalNode, IfNode, ImportAsNode, ImportFromNode, IndexNode, LambdaNode, ListComprehensionNode, MatchNode, MemberAccessNode, ModuleNameNode, ModuleNode, NameNode, NonlocalNode, ParseNode, PatternAsNode, PatternCaptureNode, PatternMappingExpandEntryNode, RaiseNode, ReturnNode, SuiteNode, TernaryNode, TryNode, TypeAliasNode, TypeAnnotationNode, TypeParameterListNode, UnaryOperationNode, WhileNode, WithNode, YieldFromNode, YieldNode } from '../parser/parseNodes';
 import { AnalyzerFileInfo } from './analyzerFileInfo';
 import { ParseTreeWalker } from './parseTreeWalker';
 export declare class Binder extends ParseTreeWalker {
@@ -7,6 +7,7 @@ export declare class Binder extends ParseTreeWalker {
     private _deferredBindingTasks;
     private _currentScope;
     private _currentFlowNode;
+    private _activeTypeParams;
     private _targetFunctionDeclaration;
     private _currentBreakTarget;
     private _currentContinueTarget;
@@ -39,6 +40,8 @@ export declare class Binder extends ParseTreeWalker {
     visitFunction(node: FunctionNode): boolean;
     visitLambda(node: LambdaNode): boolean;
     visitCall(node: CallNode): boolean;
+    visitTypeParameterList(node: TypeParameterListNode): boolean;
+    visitTypeAlias(node: TypeAliasNode): boolean;
     visitAssignment(node: AssignmentNode): boolean;
     visitAssignmentExpression(node: AssignmentExpressionNode): boolean;
     visitAugmentedAssignment(node: AugmentedAssignmentNode): boolean;
@@ -73,6 +76,7 @@ export declare class Binder extends ParseTreeWalker {
     visitPatternAs(node: PatternAsNode): boolean;
     visitPatternCapture(node: PatternCaptureNode): boolean;
     visitPatternMappingExpandEntry(node: PatternMappingExpandEntryNode): boolean;
+    private _removeActiveTypeParameters;
     private _getNonClassParentScope;
     private _addSlotsToCurrentScope;
     private _isInListComprehension;
@@ -108,6 +112,7 @@ export declare class Binder extends ParseTreeWalker {
     private _bindLoopStatement;
     private _addAntecedent;
     private _bindNameToScope;
+    private _bindNameValueToScope;
     private _bindPossibleTupleNamedTarget;
     private _addImplicitSymbolToCurrentScope;
     private _addSymbolToCurrentScope;

package/dist/analyzer/binder.js

@@ -65,6 +65,9 @@ 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.
@@ -207,19 +210,22 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     visitClass(node) {
         this.walkMultiple(node.decorators);
         const classDeclaration = {
-            type: 4 /* Class */,
+            type: 6 /* Class */,
             node,
             path: this._fileInfo.filePath,
             range: (0, positionUtils_1.convertOffsetsToRange)(node.name.start, textRange_2.TextRange.getEnd(node.name), this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
             isInExceptSuite: this._isInExceptSuite,
         };
-        const symbol = this._bindNameToScope(this._currentScope, node.name.value);
+        const symbol = this._bindNameToScope(this._currentScope, node.name);
         if (symbol) {
             symbol.addDeclaration(classDeclaration);
         }
         // Stash the declaration in the parse node for later access.
         AnalyzerNodeInfo.setDeclaration(node, classDeclaration);
+        if (node.typeParameters) {
+            this.walk(node.typeParameters);
+        }
         this.walkMultiple(node.arguments);
         this._createNewScope(2 /* Class */, this._getNonClassParentScope(), () => {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
@@ -236,15 +242,18 @@ 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) {
         this._createVariableAnnotationFlowNode();
         AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
-        const symbol = this._bindNameToScope(this._currentScope, node.name.value);
+        const symbol = this._bindNameToScope(this._currentScope, node.name);
         const containingClassNode = ParseTreeUtils.getEnclosingClass(node, /* stopAtFunction */ true);
         const functionDeclaration = {
-            type: 3 /* Function */,
+            type: 5 /* Function */,
             node,
             isMethod: !!containingClassNode,
             isGenerator: false,
@@ -258,11 +267,17 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         // Stash the declaration in the parse node for later access.
         AnalyzerNodeInfo.setDeclaration(node, functionDeclaration);
-        this.walkMultiple(node.decorators);
+        // Walk the default values prior to the type parameters.
         node.parameters.forEach((param) => {
             if (param.defaultValue) {
                 this.walk(param.defaultValue);
             }
+        });
+        if (node.typeParameters) {
+            this.walk(node.typeParameters);
+        }
+        this.walkMultiple(node.decorators);
+        node.parameters.forEach((param) => {
             if (param.typeAnnotation) {
                 this.walk(param.typeAnnotation);
             }
@@ -291,7 +306,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this._codeFlowComplexity = 0;
                 node.parameters.forEach((paramNode) => {
                     if (paramNode.name) {
-                        const symbol = this._bindNameToScope(this._currentScope, paramNode.name.value);
+                        const symbol = this._bindNameToScope(this._currentScope, paramNode.name);
                         if (symbol) {
                             const paramDeclaration = {
                                 type: 2 /* Parameter */,
@@ -325,6 +340,9 @@ 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;
     }
@@ -345,7 +363,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this._currentFlowNode = this._createStartFlowNode();
                 node.parameters.forEach((paramNode) => {
                     if (paramNode.name) {
-                        const symbol = this._bindNameToScope(this._currentScope, paramNode.name.value);
+                        const symbol = this._bindNameToScope(this._currentScope, paramNode.name);
                         if (symbol) {
                             const paramDeclaration = {
                                 type: 2 /* Parameter */,
@@ -360,6 +378,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         }
                         this._createFlowAssignment(paramNode.name);
                         this.walk(paramNode.name);
+                        AnalyzerNodeInfo.setFlowNode(paramNode, this._currentFlowNode);
                     }
                 });
                 // Walk the expression that make up the lambda body.
@@ -455,6 +474,62 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         return false;
     }
+    visitTypeParameterList(node) {
+        node.parameters.forEach((param) => {
+            if (param.boundExpression) {
+                this.walk(param.boundExpression);
+            }
+        });
+        node.parameters.forEach((param) => {
+            const name = param.name;
+            const symbol = new symbol_1.Symbol(0 /* None */);
+            const paramDeclaration = {
+                type: 3 /* TypeParameter */,
+                node: param,
+                path: this._fileInfo.filePath,
+                range: (0, positionUtils_1.convertOffsetsToRange)(node.start, textRange_2.TextRange.getEnd(node), this._fileInfo.lines),
+                moduleName: this._fileInfo.moduleName,
+                isInExceptSuite: this._isInExceptSuite,
+            };
+            symbol.addDeclaration(paramDeclaration);
+            AnalyzerNodeInfo.setDeclaration(name, paramDeclaration);
+            AnalyzerNodeInfo.setTypeParameterSymbol(name, symbol);
+            if (this._activeTypeParams.has(name.value)) {
+                this._addError(localize_1.Localizer.Diagnostic.typeParameterExistingTypeParameter().format({ name: name.value }), name);
+            }
+            else {
+                this._activeTypeParams.set(name.value, symbol);
+            }
+        });
+        return false;
+    }
+    visitTypeAlias(node) {
+        this._bindNameToScope(this._currentScope, node.name);
+        this.walk(node.name);
+        if (node.typeParameters) {
+            this.walk(node.typeParameters);
+        }
+        const typeAliasDeclaration = {
+            type: 4 /* TypeAlias */,
+            node,
+            path: this._fileInfo.filePath,
+            range: (0, positionUtils_1.convertOffsetsToRange)(node.name.start, textRange_2.TextRange.getEnd(node.name), this._fileInfo.lines),
+            moduleName: this._fileInfo.moduleName,
+            isInExceptSuite: this._isInExceptSuite,
+        };
+        const symbol = this._bindNameToScope(this._currentScope, node.name);
+        if (symbol) {
+            symbol.addDeclaration(typeAliasDeclaration);
+        }
+        // Stash the declaration in the parse node for later access.
+        AnalyzerNodeInfo.setDeclaration(node, typeAliasDeclaration);
+        this._createAssignmentTargetFlowNodes(node.name, /* walkTargets */ true, /* unbound */ false);
+        this.walk(node.expression);
+        if (node.typeParameters) {
+            this._removeActiveTypeParameters(node.typeParameters);
+        }
+        return false;
+    }
     visitAssignment(node) {
         if (this._handleTypingStubAssignmentOrAnnotation(node)) {
             return false;
@@ -617,7 +692,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 }
                 curScope = curScope.parent;
             }
-            this._bindNameToScope(containerScope, node.name.value);
+            this._bindNameToScope(containerScope, node.name);
             this._addInferredTypeAssignmentForVariable(node.name, node.rightExpression);
             this._createAssignmentTargetFlowNodes(node.name, /* walkTargets */ true, /* unbound */ false);
         }
@@ -794,6 +869,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     visitName(node) {
         AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        const typeParamSymbol = this._activeTypeParams.get(node.value);
+        if (typeParamSymbol) {
+            AnalyzerNodeInfo.setTypeParameterSymbol(node, typeParamSymbol);
+        }
         // Name nodes have no children.
         return false;
     }
@@ -876,7 +955,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         if (node.name) {
             this.walk(node.name);
-            const symbol = this._bindNameToScope(this._currentScope, node.name.value);
+            const symbol = this._bindNameToScope(this._currentScope, node.name);
             this._createAssignmentTargetFlowNodes(node.name, /* walkTargets */ true, /* unbound */ false);
             if (symbol) {
                 const declaration = {
@@ -1074,7 +1153,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this._addError(localize_1.Localizer.Diagnostic.globalReassignment().format({ name: nameValue }), name);
             }
             // Add it to the global scope if it's not already added.
-            this._bindNameToScope(globalScope, nameValue);
+            this._bindNameToScope(globalScope, name);
             if (this._currentScope !== globalScope) {
                 this._currentScope.setBindingType(nameValue, 1 /* Global */);
             }
@@ -1113,16 +1192,19 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         if (node.module.nameParts.length > 0) {
             const firstNamePartValue = node.module.nameParts[0].value;
             let symbolName;
+            let symbolNameNode;
             if (node.alias) {
                 // The symbol name is defined by the alias.
                 symbolName = node.alias.value;
+                symbolNameNode = node.alias;
             }
             else {
                 // There was no alias, so we need to use the first element of
                 // the name parts as the symbol.
                 symbolName = firstNamePartValue;
+                symbolNameNode = node.module.nameParts[0];
             }
-            const symbol = this._bindNameToScope(this._currentScope, symbolName);
+            const symbol = this._bindNameToScope(this._currentScope, symbolNameNode);
             if (symbol &&
                 (this._currentScope.type === 3 /* Module */ || this._currentScope.type === 4 /* Builtin */) &&
                 (!node.alias ||
@@ -1203,14 +1285,14 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         }
                     }
                     wildcardNames.forEach((name) => {
-                        const localSymbol = this._bindNameToScope(this._currentScope, name);
+                        const localSymbol = this._bindNameValueToScope(this._currentScope, name);
                         if (localSymbol) {
                             const importedSymbol = lookupInfo.symbolTable.get(name);
                             // Is the symbol in the target module's symbol table? If so,
                             // alias it.
                             if (importedSymbol) {
                                 const aliasDecl = {
-                                    type: 6 /* Alias */,
+                                    type: 8 /* Alias */,
                                     node,
                                     path: resolvedPath,
                                     loadSymbolsFromPath: true,
@@ -1230,7 +1312,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                     const implicitImport = importInfo.filteredImplicitImports.find((imp) => imp.name === name);
                                     if (implicitImport) {
                                         const submoduleFallback = {
-                                            type: 6 /* Alias */,
+                                            type: 8 /* Alias */,
                                             node,
                                             path: implicitImport.path,
                                             loadSymbolsFromPath: true,
@@ -1240,7 +1322,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                             isInExceptSuite: this._isInExceptSuite,
                                         };
                                         const aliasDecl = {
-                                            type: 6 /* Alias */,
+                                            type: 8 /* Alias */,
                                             node,
                                             path: resolvedPath,
                                             loadSymbolsFromPath: true,
@@ -1278,7 +1360,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             node.imports.forEach((importSymbolNode) => {
                 const importedName = importSymbolNode.name.value;
                 const nameNode = importSymbolNode.alias || importSymbolNode.name;
-                const symbol = this._bindNameToScope(this._currentScope, nameNode.value);
+                const symbol = this._bindNameToScope(this._currentScope, nameNode);
                 if (symbol) {
                     // All import statements of the form `from . import x` treat x
                     // as an externally-visible (not hidden) symbol.
@@ -1306,7 +1388,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     let loadSymbolsFromPath = true;
                     if (implicitImport) {
                         submoduleFallback = {
-                            type: 6 /* Alias */,
+                            type: 8 /* Alias */,
                             node: importSymbolNode,
                             path: implicitImport.path,
                             loadSymbolsFromPath: true,
@@ -1325,7 +1407,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         }
                     }
                     const aliasDecl = {
-                        type: 6 /* Alias */,
+                        type: 8 /* Alias */,
                         node: importSymbolNode,
                         path: resolvedPath,
                         loadSymbolsFromPath,
@@ -1605,7 +1687,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._currentFlowNode = this._finishFlowLabel(postOrLabel);
         if (node.target) {
             this.walk(node.target);
-            const symbol = this._bindNameToScope(this._currentScope, node.target.value);
+            const symbol = this._bindNameToScope(this._currentScope, node.target);
             this._createAssignmentTargetFlowNodes(node.target, /* walkTargets */ false, /* unbound */ false);
             if (symbol) {
                 const declaration = {
@@ -1635,6 +1717,18 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         return true;
     }
+    _removeActiveTypeParameters(node) {
+        node.parameters.forEach((typeParamNode) => {
+            const entry = this._activeTypeParams.get(typeParamNode.name.value);
+            if (entry) {
+                const decls = entry.getDeclarations();
+                (0, debug_1.assert)(decls && decls.length === 1 && decls[0].type === 3 /* 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.
@@ -1700,7 +1794,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     _addPatternCaptureTarget(target) {
-        const symbol = this._bindNameToScope(this._currentScope, target.value);
+        const symbol = this._bindNameToScope(this._currentScope, target);
         this._createAssignmentTargetFlowNodes(target, /* walkTargets */ false, /* unbound */ false);
         if (symbol) {
             const declaration = {
@@ -1731,7 +1825,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             return undefined;
         }
         // There should be only one declaration for the variable.
-        const aliasDecl = varSymbol.getDeclarations().find((decl) => decl.type === 6 /* Alias */);
+        const aliasDecl = varSymbol.getDeclarations().find((decl) => decl.type === 8 /* Alias */);
         const resolvedPath = (aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.path) && aliasDecl.loadSymbolsFromPath
             ? aliasDecl.path
             : ((_a = aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.submoduleFallback) === null || _a === void 0 ? void 0 : _a.path) && aliasDecl.submoduleFallback.loadSymbolsFromPath
@@ -1748,7 +1842,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     _addImplicitFromImport(node, importInfo) {
         const symbolName = node.module.nameParts[0].value;
-        const symbol = this._bindNameToScope(this._currentScope, symbolName);
+        const symbol = this._bindNameValueToScope(this._currentScope, symbolName);
         if (symbol) {
             this._createAliasDeclarationForMultipartImportName(node, /* importAlias */ undefined, importInfo, symbol);
         }
@@ -1766,7 +1860,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // python module loader.
         const existingDecl = symbol
             .getDeclarations()
-            .find((decl) => decl.type === 6 /* Alias */ && decl.firstNamePart === firstNamePartValue);
+            .find((decl) => decl.type === 8 /* Alias */ && decl.firstNamePart === firstNamePartValue);
         let newDecl;
         let pathOfLastSubmodule;
         if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedPaths.length > 0) {
@@ -1781,7 +1875,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         else if (isResolved) {
             newDecl = {
-                type: 6 /* Alias */,
+                type: 8 /* Alias */,
                 node,
                 path: pathOfLastSubmodule,
                 loadSymbolsFromPath: false,
@@ -1797,7 +1891,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // bogus path so it gets an unknown type (rather than an unbound type) at
             // analysis time.
             newDecl = {
-                type: 6 /* Alias */,
+                type: 8 /* Alias */,
                 node,
                 path: pathOfLastSubmodule,
                 loadSymbolsFromPath: true,
@@ -2388,7 +2482,14 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
     }
-    _bindNameToScope(scope, name, addedSymbols) {
+    _bindNameToScope(scope, node, addedSymbols) {
+        // Is this name already used by an active type parameter?
+        if (this._activeTypeParams.get(node.value)) {
+            this._addError(localize_1.Localizer.Diagnostic.overwriteTypeParameter().format({ name: node.value }), node);
+        }
+        return this._bindNameValueToScope(scope, node.value, addedSymbols);
+    }
+    _bindNameValueToScope(scope, name, addedSymbols) {
         // Is this name already bound to a scope other than the local one?
         const bindingType = this._currentScope.getBindingType(name);
         if (bindingType !== undefined) {
@@ -2436,7 +2537,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     _bindPossibleTupleNamedTarget(target, addedSymbols) {
         switch (target.nodeType) {
             case 38 /* Name */: {
-                this._bindNameToScope(this._currentScope, target.value, addedSymbols);
+                this._bindNameToScope(this._currentScope, target, addedSymbols);
                 break;
             }
             case 52 /* Tuple */: {
@@ -2554,7 +2655,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         if (!symbol.isClassMember() ||
                             !symbol
                                 .getDeclarations()
-                                .some((decl) => decl.type === 3 /* Function */ && decl.isMethod)) {
+                                .some((decl) => decl.type === 5 /* Function */ && decl.isMethod)) {
                             symbol.setIsInstanceMember();
                         }
                     }
@@ -3067,10 +3168,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         if (!specialTypes.has(assignedName)) {
             return false;
         }
-        const symbol = this._bindNameToScope(this._currentScope, assignedName);
+        const symbol = this._bindNameToScope(this._currentScope, annotationNode.valueExpression);
         if (symbol) {
             symbol.addDeclaration({
-                type: 5 /* SpecialBuiltInClass */,
+                type: 7 /* SpecialBuiltInClass */,
                 node: annotationNode,
                 path: this._fileInfo.filePath,
                 range: (0, positionUtils_1.convertOffsetsToRange)(annotationNode.start, textRange_2.TextRange.getEnd(annotationNode), this._fileInfo.lines),
@@ -3087,6 +3188,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._deferredBindingTasks.push({
             scope: this._currentScope,
             codeFlowExpressions: this._currentScopeCodeFlowExpressions,
+            activeTypeParams: new Map(this._activeTypeParams),
             callback,
         });
     }
@@ -3096,6 +3198,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // Reset the state
             this._currentScope = nextItem.scope;
             this._currentScopeCodeFlowExpressions = nextItem.codeFlowExpressions;
+            this._activeTypeParams = nextItem.activeTypeParams;
             nextItem.callback();
         }
     }