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

package/dist/analyzer/cacheManager.d.ts

@@ -1,13 +1,22 @@
+/// <reference types="node" />
+import { Worker } from 'worker_threads';
+import { AnalysisRequest } from '../backgroundAnalysisBase';
 import { ConsoleInterface } from '../common/console';
 export interface CacheOwner {
     getCacheUsage(): number;
     emptyCache(): void;
 }
 export declare class CacheManager {
+    private readonly _maxWorkers;
     private _pausedCount;
     private readonly _cacheOwners;
+    private _sharedUsageBuffer;
+    private _sharedUsagePosition;
     private _lastHeapStats;
+    constructor(_maxWorkers?: number);
     registerCacheOwner(provider: CacheOwner): void;
+    addWorker(index: number, worker: Worker): void;
+    handleCachedUsageBufferMessage(msg: AnalysisRequest): void;
     unregisterCacheOwner(provider: CacheOwner): void;
     pauseTracking(): {
         dispose(): void;
@@ -16,6 +25,8 @@ export declare class CacheManager {
     emptyCache(console?: ConsoleInterface): void;
     getUsedHeapRatio(console?: ConsoleInterface): number;
     private _convertToMB;
+    private _getSharedUsageBuffer;
+    private _getTotalHeapUsage;
 }
 export declare namespace CacheManager {
     function is(obj: any): obj is CacheManager;

package/dist/analyzer/cacheManager.js

@@ -13,14 +13,42 @@ exports.CacheManager = void 0;
 const debug_1 = require("../common/debug");
 const memUtils_1 = require("../common/memUtils");
 class CacheManager {
-    constructor() {
+    constructor(_maxWorkers = 0) {
+        this._maxWorkers = _maxWorkers;
         this._pausedCount = 0;
         this._cacheOwners = [];
+        this._sharedUsagePosition = 0;
         this._lastHeapStats = Date.now();
     }
     registerCacheOwner(provider) {
         this._cacheOwners.push(provider);
     }
+    addWorker(index, worker) {
+        // Send the sharedArrayBuffer to the worker so it can be used
+        // to keep track of heap usage on all threads.
+        const buffer = this._getSharedUsageBuffer();
+        if (buffer) {
+            // The SharedArrayBuffer needs to be separate from data in order for it
+            // to be marshalled correctly.
+            worker.postMessage({ requestType: 'cacheUsageBuffer', sharedUsageBuffer: buffer, data: index.toString() });
+            worker.on('exit', () => {
+                const view = new Float64Array(buffer);
+                view[index] = 0;
+            });
+        }
+    }
+    handleCachedUsageBufferMessage(msg) {
+        if (msg.requestType === 'cacheUsageBuffer') {
+            const index = parseInt(msg.data || '0');
+            const buffer = msg.sharedUsageBuffer;
+            // Index of zero is reserved for the main thread so if
+            // the index isn't passed, don't save the shared buffer.
+            if (buffer && index) {
+                this._sharedUsageBuffer = buffer;
+                this._sharedUsagePosition = index;
+            }
+        }
+    }
     unregisterCacheOwner(provider) {
         const index = this._cacheOwners.findIndex((p) => p === provider);
         if (index < 0) {
@@ -61,21 +89,50 @@ class CacheManager {
     // Returns a ratio of used bytes to total bytes.
     getUsedHeapRatio(console) {
         const heapStats = (0, memUtils_1.getHeapStatistics)();
+        let usage = this._getTotalHeapUsage(heapStats);
         if (console && Date.now() - this._lastHeapStats > 1000) {
             // This can fill up the user's console, so we only do it once per second.
             this._lastHeapStats = Date.now();
             console.info(`Heap stats: ` +
                 `total_heap_size=${this._convertToMB(heapStats.total_heap_size)}, ` +
                 `used_heap_size=${this._convertToMB(heapStats.used_heap_size)}, ` +
+                `cross_worker_used_heap_size=${this._convertToMB(usage)}, ` +
                 `total_physical_size=${this._convertToMB(heapStats.total_physical_size)}, ` +
                 `total_available_size=${this._convertToMB(heapStats.total_available_size)}, ` +
                 `heap_size_limit=${this._convertToMB(heapStats.heap_size_limit)}`);
         }
-        return heapStats.used_heap_size / heapStats.heap_size_limit;
+        // Total usage seems to be off by about 5%, so we'll add that back in
+        // to make the ratio more accurate. (200MB at 4GB)
+        usage += usage * 0.05;
+        return usage / heapStats.heap_size_limit;
     }
     _convertToMB(bytes) {
         return `${Math.round(bytes / (1024 * 1024))}MB`;
     }
+    _getSharedUsageBuffer() {
+        try {
+            if (!this._sharedUsageBuffer && this._maxWorkers > 0) {
+                // Allocate enough space for the workers and the main thread.
+                this._sharedUsageBuffer = new SharedArrayBuffer(8 * (this._maxWorkers + 1));
+            }
+            return this._sharedUsageBuffer;
+        }
+        catch {
+            // SharedArrayBuffer is not supported.
+            return undefined;
+        }
+    }
+    _getTotalHeapUsage(heapStats) {
+        // If the SharedArrayBuffer is supported, we'll use it to to get usage
+        // from other threads and add that to our own
+        const buffer = this._getSharedUsageBuffer();
+        if (buffer) {
+            const view = new Float64Array(buffer);
+            view[this._sharedUsagePosition] = heapStats.used_heap_size;
+            return view.reduce((a, b) => a + b, 0);
+        }
+        return heapStats.used_heap_size;
+    }
 }
 exports.CacheManager = CacheManager;
 (function (CacheManager) {

package/dist/analyzer/cacheManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheManager.js","sourceRoot":"","sources":["../../../../../src/analyzer/cacheManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cacheManager.js","sourceRoot":"","sources":["../../../../../src/analyzer/cacheManager.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAMH,2CAAuC;AACvC,iDAAuD;AAWvD,MAAa,YAAY;IAOrB,YAA6B,cAAsB,CAAC;QAAvB,gBAAW,GAAX,WAAW,CAAY;QAN5C,iBAAY,GAAG,CAAC,CAAC;QACR,iBAAY,GAAiB,EAAE,CAAC;QAEzC,yBAAoB,GAAG,CAAC,CAAC;QACzB,mBAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEmB,CAAC;IACxD,kBAAkB,CAAC,QAAoB;QACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,KAAa,EAAE,MAAc;QACnC,6DAA6D;QAC7D,8CAA8C;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC5C,IAAI,MAAM,EAAE;YACR,uEAAuE;YACvE,8BAA8B;YAC9B,MAAM,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC3G,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACnB,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;gBACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAED,8BAA8B,CAAC,GAAoB;QAC/C,IAAI,GAAG,CAAC,WAAW,KAAK,kBAAkB,EAAE;YACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC;YACrC,sDAAsD;YACtD,wDAAwD;YACxD,IAAI,MAAM,IAAI,KAAK,EAAE;gBACjB,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC;gBACjC,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;aACrC;SACJ;IACL,CAAC;IAED,oBAAoB,CAAC,QAAoB;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;QACjE,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,IAAA,YAAI,EAAC,oCAAoC,CAAC,CAAC;SAC9C;aAAM;YACH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACtC;IACL,CAAC;IAED,aAAa;QACT,MAAM,KAAK,GAAG,IAAI,CAAC;QACnB,KAAK,CAAC,YAAY,EAAE,CAAC;QACrB,OAAO;YACH,OAAO;gBACH,KAAK,CAAC,YAAY,EAAE,CAAC;YACzB,CAAC;SACJ,CAAC;IACN,CAAC;IAED,aAAa;QACT,IAAI,IAAI,CAAC,YAAY,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,CAAC,CAAC;SACb;QAED,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5B,UAAU,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,OAA0B;QACjC,IAAI,OAAO,EAAE;YACT,MAAM,SAAS,GAAG,IAAA,4BAAiB,GAAE,CAAC;YAEtC,OAAO,CAAC,IAAI,CACR,oDAAoD,IAAI,CAAC,YAAY,CACjE,SAAS,CAAC,cAAc,CAC3B,WAAW,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAC9D,CAAC;SACL;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5B,CAAC,CAAC,UAAU,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,gDAAgD;IAChD,gBAAgB,CAAC,OAA0B;QACvC,MAAM,SAAS,GAAG,IAAA,4BAAiB,GAAE,CAAC;QACtC,IAAI,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAE/C,IAAI,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,EAAE;YACpD,yEAAyE;YACzE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CACR,cAAc;gBACV,mBAAmB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI;gBACnE,kBAAkB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI;gBACjE,+BAA+B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI;gBAC3D,uBAAuB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI;gBAC3E,wBAAwB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI;gBAC7E,mBAAmB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CACxE,CAAC;SACL;QAED,qEAAqE;QACrE,kDAAkD;QAClD,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC;QAEtB,OAAO,KAAK,GAAG,SAAS,CAAC,eAAe,CAAC;IAC7C,CAAC;IAEO,YAAY,CAAC,KAAa;QAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;IACpD,CAAC;IAEO,qBAAqB;QACzB,IAAI;YACA,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE;gBAClD,6DAA6D;gBAC7D,IAAI,CAAC,kBAAkB,GAAG,IAAI,iBAAiB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC;aAC/E;YAED,OAAO,IAAI,CAAC,kBAAkB,CAAC;SAClC;QAAC,MAAM;YACJ,sCAAsC;YACtC,OAAO,SAAS,CAAC;SACpB;IACL,CAAC;IAEO,kBAAkB,CAAC,SAAmB;QAC1C,sEAAsE;QACtE,6CAA6C;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC5C,IAAI,MAAM,EAAE;YACR,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,SAAS,CAAC,cAAc,CAAC;YAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;SAC1C;QAED,OAAO,SAAS,CAAC,cAAc,CAAC;IACpC,CAAC;CACJ;AAjJD,oCAiJC;AAED,WAAiB,YAAY;IACzB,SAAgB,EAAE,CAAC,GAAQ;QACvB,OAAO,CACH,GAAG,CAAC,kBAAkB,KAAK,SAAS;YACpC,GAAG,CAAC,oBAAoB,KAAK,SAAS;YACtC,GAAG,CAAC,aAAa,KAAK,SAAS;YAC/B,GAAG,CAAC,aAAa,KAAK,SAAS;YAC/B,GAAG,CAAC,UAAU,KAAK,SAAS;YAC5B,GAAG,CAAC,gBAAgB,KAAK,SAAS,CACrC,CAAC;IACN,CAAC;IATe,eAAE,KASjB,CAAA;AACL,CAAC,EAXgB,YAAY,4BAAZ,YAAY,QAW5B"}

package/dist/analyzer/checker.d.ts

@@ -1,5 +1,5 @@
 import { AssertNode, AssignmentExpressionNode, AssignmentNode, AugmentedAssignmentNode, AwaitNode, BinaryOperationNode, CallNode, CaseNode, ClassNode, DelNode, DictionaryNode, ErrorNode, ExceptNode, ForNode, FormatStringNode, FunctionNode, GlobalNode, IfNode, ImportAsNode, ImportFromAsNode, ImportFromNode, IndexNode, LambdaNode, ListComprehensionIfNode, ListComprehensionNode, ListNode, MatchNode, MemberAccessNode, ModuleNameNode, NameNode, NonlocalNode, ParseNode, PatternClassNode, RaiseNode, ReturnNode, SetNode, SliceNode, StatementListNode, StringListNode, SuiteNode, TernaryNode, TryNode, TupleNode, TypeAliasNode, TypeAnnotationNode, TypeParameterListNode, TypeParameterNode, UnaryOperationNode, UnpackNode, WhileNode, WithNode, YieldFromNode, YieldNode } from '../parser/parseNodes';
-import { ParseResults } from '../parser/parser';
+import { ParserOutput } from '../parser/parser';
 import { ImportResolver } from './importResolver';
 import { ParseTreeWalker } from './parseTreeWalker';
 import { SourceMapper } from './sourceMapper';
@@ -14,7 +14,7 @@ export declare class Checker extends ParseTreeWalker {
     private _isUnboundCheckSuppressed;
     private _scopedNodes;
     private _typeParameterLists;
-    constructor(_importResolver: ImportResolver, _evaluator: TypeEvaluator, parseResults: ParseResults, _sourceMapper: SourceMapper, _dependentFiles?: ParseResults[] | undefined);
+    constructor(_importResolver: ImportResolver, _evaluator: TypeEvaluator, parseResults: ParserOutput, _sourceMapper: SourceMapper, _dependentFiles?: ParserOutput[] | undefined);
     check(): void;
     walk(node: ParseNode): void;
     visitSuite(node: SuiteNode): boolean;

package/dist/analyzer/checker.js

@@ -2189,7 +2189,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // If there's one or more declaration with a declared type,
         // all other declarations should match. The only exception is
         // for functions that have an overload.
-        const primaryDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(symbol);
+        const primaryDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(symbol);
         // If there's no declaration with a declared type, we're done.
         if (!primaryDecl) {
             return;
@@ -3423,7 +3423,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     // Validates that any overridden member variables are not marked
     // as Final in parent classes.
     _validateFinalMemberOverrides(classType) {
-        classType.details.fields.forEach((localSymbol, name) => {
+        types_1.ClassType.getSymbolTable(classType).forEach((localSymbol, name) => {
             const parentSymbol = (0, typeUtils_1.lookUpClassMember)(classType, name, 1 /* MemberAccessFlags.SkipOriginalClass */);
             if (parentSymbol && (0, types_1.isInstantiableClass)(parentSymbol.classType) && !SymbolNameUtils.isPrivateName(name)) {
                 // Did the parent class explicitly declare the variable as final?
@@ -3475,7 +3475,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 initMemberTypeResult = undefined;
             }
         }
-        classType.details.fields.forEach((symbol, name) => {
+        types_1.ClassType.getSymbolTable(classType).forEach((symbol, name) => {
             var _a;
             // Enum members don't have type annotations.
             if (symbol.getTypedDeclarations().length > 0) {
@@ -3553,7 +3553,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         const initOnlySymbolMap = new Map();
         types_1.ClassType.getReverseMro(classType).forEach((mroClass) => {
             if ((0, types_1.isClass)(mroClass) && types_1.ClassType.isDataClass(mroClass)) {
-                mroClass.details.fields.forEach((symbol, name) => {
+                types_1.ClassType.getSymbolTable(mroClass).forEach((symbol, name) => {
                     if (symbol.isInitVar()) {
                         initOnlySymbolMap.set(name, symbol);
                     }
@@ -3665,7 +3665,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (types_1.ClassType.isFinal(classType)) {
             (0, typeUtils_1.getProtocolSymbolsRecursive)(classType, abstractSymbols, 2048 /* ClassTypeFlags.SupportsAbstractMethods */);
         }
-        classType.details.fields.forEach((localSymbol, name) => {
+        types_1.ClassType.getSymbolTable(classType).forEach((localSymbol, name) => {
             abstractSymbols.delete(name);
             // This applies only to instance members.
             if (!localSymbol.isInstanceMember()) {
@@ -3833,7 +3833,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (types_1.ClassType.isDataClass(classType)) {
             return;
         }
-        classType.details.fields.forEach((symbol, name) => {
+        types_1.ClassType.getSymbolTable(classType).forEach((symbol, name) => {
             const decls = symbol.getDeclarations();
             const isDefinedBySlots = decls.some((decl) => decl.type === 1 /* DeclarationType.Variable */ && decl.isDefinedBySlots);
             if (isDefinedBySlots) {
@@ -4080,13 +4080,13 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         const overrideSymbol = overrideClassAndSymbol.symbol;
         let overrideType = this._evaluator.getEffectiveTypeOfSymbol(overrideSymbol);
         overrideType = (0, typeUtils_1.partiallySpecializeType)(overrideType, overrideClassAndSymbol.classType);
-        const childOverrideSymbol = childClassType.details.fields.get(memberName);
+        const childOverrideSymbol = types_1.ClassType.getSymbolTable(childClassType).get(memberName);
         const childOverrideType = childOverrideSymbol
             ? this._evaluator.getEffectiveTypeOfSymbol(childOverrideSymbol)
             : undefined;
         let diag;
-        const overrideDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(overrideClassAndSymbol.symbol);
-        const overriddenDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(overriddenClassAndSymbol.symbol);
+        const overrideDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overrideClassAndSymbol.symbol);
+        const overriddenDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overriddenClassAndSymbol.symbol);
         if ((0, types_1.isFunction)(overriddenType) || (0, types_1.isOverloadedFunction)(overriddenType)) {
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();
             let overrideFunction;
@@ -4134,7 +4134,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             // This check can be expensive, so don't perform it if the corresponding
             // rule is disabled.
             if (this._fileInfo.diagnosticRuleSet.reportIncompatibleVariableOverride !== 'none') {
-                const primaryDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(overriddenClassAndSymbol.symbol);
+                const primaryDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overriddenClassAndSymbol.symbol);
                 let isInvariant = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 /* DeclarationType.Variable */ && !primaryDecl.isFinal;
                 // If the entry is a member of a frozen dataclass, it is immutable,
                 // so it does not need to be invariant.
@@ -4208,8 +4208,8 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     // are decorated. For example, if the first overload is not marked @final
     // but subsequent ones are, an error should be reported.
     _validateOverloadDecoratorConsistency(classType) {
-        classType.details.fields.forEach((symbol, name) => {
-            const primaryDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(symbol);
+        types_1.ClassType.getSymbolTable(classType).forEach((symbol, name) => {
+            const primaryDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(symbol);
             if (!primaryDecl || primaryDecl.type !== 5 /* DeclarationType.Function */) {
                 return;
             }
@@ -4331,7 +4331,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     // types as the original method. Also marks the class as abstract if one
     // or more abstract methods are not overridden.
     _validateBaseClassOverrides(classType) {
-        classType.details.fields.forEach((symbol, name) => {
+        types_1.ClassType.getSymbolTable(classType).forEach((symbol, name) => {
             // Private symbols do not need to match in type since their
             // names are mangled, and subclasses can't access the value in
             // the parent class.
@@ -4489,13 +4489,13 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 }
             }
             if (reportFinalMethodOverride) {
-                const decl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(overrideSymbol);
+                const decl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overrideSymbol);
                 if (decl && decl.type === 5 /* DeclarationType.Function */) {
                     const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.LocMessage.finalMethodOverride().format({
                         name: memberName,
                         className: baseClass.details.name,
                     }), decl.node.name);
-                    const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
+                    const origDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(baseClassAndSymbol.symbol);
                     if (diag && origDecl) {
                         diag.addRelatedInfo(localize_1.LocAddendum.finalMethod(), origDecl.uri, origDecl.range);
                     }
@@ -4516,13 +4516,13 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     if (!this._evaluator.validateOverrideMethod(baseType, overrideType, childClassType, diagAddendum, enforceParamNameMatch)) {
                         const decl = (0, types_1.isFunction)(overrideType) && overrideType.details.declaration
                             ? overrideType.details.declaration
-                            : (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(overrideSymbol);
+                            : (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overrideSymbol);
                         if (decl) {
                             const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.LocMessage.incompatibleMethodOverride().format({
                                 name: memberName,
                                 className: baseClass.details.name,
                             }) + diagAddendum.getString(), (_a = (0, declarationUtils_1.getNameNodeForDeclaration)(decl)) !== null && _a !== void 0 ? _a : decl.node);
-                            const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
+                            const origDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(baseClassAndSymbol.symbol);
                             if (diag && origDecl) {
                                 diag.addRelatedInfo(localize_1.LocAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                             }
@@ -4543,7 +4543,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             className: baseClass.details.name,
                             type: this._evaluator.printType(overrideType),
                         }), (_b = (0, declarationUtils_1.getNameNodeForDeclaration)(lastDecl)) !== null && _b !== void 0 ? _b : lastDecl.node);
-                        const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
+                        const origDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(baseClassAndSymbol.symbol);
                         if (diag && origDecl) {
                             diag.addRelatedInfo(localize_1.LocAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                         }
@@ -4683,7 +4683,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             name: memberName,
                             className: baseClass.details.name,
                         }) + diagAddendum.getString(), (_h = (0, declarationUtils_1.getNameNodeForDeclaration)(lastDecl)) !== null && _h !== void 0 ? _h : lastDecl.node);
-                        const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
+                        const origDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(baseClassAndSymbol.symbol);
                         if (diag && origDecl) {
                             diag.addRelatedInfo(localize_1.LocAddendum.overriddenSymbol(), origDecl.uri, origDecl.range);
                         }
@@ -4750,7 +4750,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             name: memberName,
                             className: baseClass.details.name,
                         }), (_m = (0, declarationUtils_1.getNameNodeForDeclaration)(lastDecl)) !== null && _m !== void 0 ? _m : lastDecl.node);
-                        const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
+                        const origDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(baseClassAndSymbol.symbol);
                         if (diag && origDecl) {
                             diag.addRelatedInfo(localize_1.LocAddendum.overriddenSymbol(), origDecl.uri, origDecl.range);
                         }
@@ -4926,6 +4926,15 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (!paramInfo.typeAnnotation || !paramInfo.name) {
             return;
         }
+        // If this is an __init__ method, we need to specifically check for the
+        // use of class-scoped TypeVars, which are not allowed in this context
+        // according to the typing spec.
+        if (functionType.details.name === '__init__' && functionType.details.methodClass) {
+            const typeVars = (0, typeUtils_1.getTypeVarArgumentsRecursive)(paramInfo.type);
+            if (typeVars.some((typeVar) => { var _a; return typeVar.scopeId === ((_a = functionType.details.methodClass) === null || _a === void 0 ? void 0 : _a.details.typeVarScopeId); })) {
+                this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.initMethodSelfParamTypeVar(), paramInfo.typeAnnotation);
+            }
+        }
         // If this is a protocol class, the self and cls parameters can be bound
         // to something other than the class.
         if (types_1.ClassType.isProtocolClass(classType)) {