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

package/dist/analyzer/symbol.d.ts

@@ -13,7 +13,8 @@ export declare const enum SymbolFlags {
     PrivatePyTypedImport = 512,
     InitVar = 1024,
     NamedTupleMember = 2048,
-    IgnoredForOverrideChecks = 4096
+    IgnoredForOverrideChecks = 4096,
+    FinalVarInClassBody = 8192
 }
 export declare const indeterminateSymbolId = 0;
 export declare class Symbol {
@@ -34,6 +35,8 @@ export declare class Symbol {
     isInstanceMember(): boolean;
     setIsClassVar(): void;
     isClassVar(): boolean;
+    setIsFinalVarInClassBody(): void;
+    isFinalVarInClassBody(): boolean;
     setIsInitVar(): void;
     isInitVar(): boolean;
     setIsInDunderAll(): void;

package/dist/analyzer/symbol.js

@@ -48,6 +48,10 @@ var SymbolFlags;
     SymbolFlags[SymbolFlags["NamedTupleMember"] = 2048] = "NamedTupleMember";
     // Indicates that the symbol should be exempt from override type checks.
     SymbolFlags[SymbolFlags["IgnoredForOverrideChecks"] = 4096] = "IgnoredForOverrideChecks";
+    // Indicates that the symbol is marked Final and is assigned a value
+    // in the class body. The typing spec indicates that these should be
+    // considered ClassVars unless they are found in a dataclass.
+    SymbolFlags[SymbolFlags["FinalVarInClassBody"] = 8192] = "FinalVarInClassBody";
 })(SymbolFlags || (exports.SymbolFlags = SymbolFlags = {}));
 let nextSymbolId = 1;
 function getUniqueSymbolId() {
@@ -98,6 +102,12 @@ class Symbol {
     isClassVar() {
         return !!(this._flags & 128 /* SymbolFlags.ClassVar */);
     }
+    setIsFinalVarInClassBody() {
+        this._flags |= 8192 /* SymbolFlags.FinalVarInClassBody */;
+    }
+    isFinalVarInClassBody() {
+        return !!(this._flags & 8192 /* SymbolFlags.FinalVarInClassBody */);
+    }
     setIsInitVar() {
         this._flags |= 1024 /* SymbolFlags.InitVar */;
     }

package/dist/analyzer/symbol.js.map

@@ -1 +1 @@
-{"version":3,"file":"symbol.js","sourceRoot":"","sources":["../../../../../src/analyzer/symbol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"symbol.js","sourceRoot":"","sources":["../../../../../src/analyzer/symbol.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAGH,yDAAgF;AAGhF,IAAkB,WAoDjB;AApDD,WAAkB,WAAW;IACzB,6CAAQ,CAAA;IAER,uDAAuD;IACvD,wDAAwD;IACxD,4DAA4D;IAC5D,6BAA6B;IAC7B,qEAAyB,CAAA;IAEzB,6DAA6D;IAC7D,iCAAiC;IACjC,qEAAyB,CAAA;IAEzB,0DAA0D;IAC1D,2DAAoB,CAAA;IAEpB,8DAA8D;IAC9D,iEAAuB,CAAA;IAEvB,2DAA2D;IAC3D,oEAAoE;IACpE,gEAAsB,CAAA;IAEtB,2DAA2D;IAC3D,kEAAkE;IAClE,oFAAgC,CAAA;IAEhC,2DAA2D;IAC3D,8CAA8C;IAC9C,uDAAiB,CAAA;IAEjB,2CAA2C;IAC3C,6DAAoB,CAAA;IAEpB,sEAAsE;IACtE,+EAA6B,CAAA;IAE7B,mEAAmE;IACnE,sDAAiB,CAAA;IAEjB,oEAAoE;IACpE,kEAAkE;IAClE,gBAAgB;IAChB,wEAA0B,CAAA;IAE1B,wEAAwE;IACxE,wFAAkC,CAAA;IAElC,oEAAoE;IACpE,oEAAoE;IACpE,6DAA6D;IAC7D,8EAA6B,CAAA;AACjC,CAAC,EApDiB,WAAW,2BAAX,WAAW,QAoD5B;AAED,IAAI,YAAY,GAAG,CAAC,CAAC;AACrB,SAAS,iBAAiB;IACtB,OAAO,YAAY,EAAE,CAAC;AAC1B,CAAC;AAED,6DAA6D;AAChD,QAAA,qBAAqB,GAAG,CAAC,CAAC;AAEvC,MAAa,MAAM;IAkBf,YAAY,KAAkB;QAC1B,IAAI,CAAC,EAAE,GAAG,iBAAiB,EAAE,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,KAAkB,EAAE,IAAU;QAChD,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QACpC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAClC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,kBAAkB;QACd,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,uCAA+B,CAAC,CAAC;IAC1D,CAAC;IAED,qBAAqB;QACjB,IAAI,CAAC,MAAM,wCAAgC,CAAC;IAChD,CAAC;IAED,kBAAkB;QACd,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,uCAA+B,CAAC,CAAC;IAC1D,CAAC;IAED,4BAA4B;QACxB,IAAI,CAAC,MAAM,gDAAuC,CAAC;IACvD,CAAC;IAED,yBAAyB;QACrB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,+CAAsC,CAAC,CAAC;IACjE,CAAC;IAED,gBAAgB;QACZ,IAAI,CAAC,MAAM,mCAA2B,CAAC;IAC3C,CAAC;IAED,aAAa;QACT,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,kCAA0B,CAAC,CAAC;IACrD,CAAC;IAED,mBAAmB;QACf,IAAI,CAAC,MAAM,sCAA8B,CAAC;IAC9C,CAAC;IAED,gBAAgB;QACZ,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,qCAA6B,CAAC,CAAC;IACxD,CAAC;IAED,aAAa;QACT,IAAI,CAAC,MAAM,kCAAwB,CAAC;IACxC,CAAC;IAED,UAAU;QACN,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,iCAAuB,CAAC,CAAC;IAClD,CAAC;IAED,wBAAwB;QACpB,IAAI,CAAC,MAAM,8CAAmC,CAAC;IACnD,CAAC;IAED,qBAAqB;QACjB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,6CAAkC,CAAC,CAAC;IAC7D,CAAC;IAED,YAAY;QACR,IAAI,CAAC,MAAM,kCAAuB,CAAC;IACvC,CAAC;IAED,SAAS;QACL,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,iCAAsB,CAAC,CAAC;IACjD,CAAC;IAED,gBAAgB;QACZ,IAAI,CAAC,MAAM,qCAA2B,CAAC;IAC3C,CAAC;IAED,aAAa;QACT,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,oCAA0B,CAAC,CAAC;IACrD,CAAC;IAED,kBAAkB;QACd,IAAI,CAAC,MAAM,sCAA6B,CAAC;IAC7C,CAAC;IAED,eAAe;QACX,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,qCAA4B,CAAC,CAAC;IACvD,CAAC;IAED,uBAAuB;QACnB,IAAI,CAAC,MAAM,8CAAoC,CAAC;IACpD,CAAC;IAED,sBAAsB;QAClB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,6CAAmC,CAAC,CAAC;IAC9D,CAAC;IAED,wBAAwB;QACpB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,0CAA+B,CAAC,CAAC;IAC1D,CAAC;IAED,0BAA0B;QACtB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,kDAAuC,CAAC,CAAC;IAClE,CAAC;IAED,cAAc,CAAC,WAAwB;QACnC,IAAI,IAAI,CAAC,aAAa,EAAE;YACpB,mEAAmE;YACnE,mEAAmE;YACnE,YAAY;YACZ,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,sCAAmB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;YACjG,IAAI,SAAS,GAAG,CAAC,EAAE;gBACf,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAErC,8DAA8D;gBAC9D,iCAAiC;gBACjC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,IAAI,qCAA6B,IAAI,IAAI,CAAC,aAAa,EAAE;wBAC9D,OAAO,IAAI,CAAC,aAAa,CAAC;qBAC7B;gBACL,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,+DAA+D;gBAC/D,oBAAoB;gBACpB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;gBAC9C,IAAI,IAAA,wCAAqB,EAAC,WAAW,CAAC,EAAE;oBACpC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;oBAC5C,IAAI,OAAO,CAAC,IAAI,qCAA6B,IAAI,WAAW,CAAC,IAAI,qCAA6B,EAAE;wBAC5F,IAAI,CAAC,WAAW,CAAC,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,EAAE;4BAC/D,WAAW,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;yBAC/D;qBACJ;iBACJ;qBAAM,IAAI,WAAW,CAAC,IAAI,qCAA6B,EAAE;oBACtD,mEAAmE;oBACnE,qEAAqE;oBACrE,sCAAsC;oBACtC,IAAI,OAAO,CAAC,IAAI,qCAA6B,EAAE;wBAC3C,IAAI,WAAW,CAAC,OAAO,EAAE;4BACrB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;yBAC1B;wBAED,OAAO,CAAC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;wBAElD,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,WAAW,CAAC,kBAAkB,EAAE;4BAC/D,OAAO,CAAC,kBAAkB,GAAG,WAAW,CAAC,kBAAkB,CAAC;yBAC/D;qBACJ;iBACJ;aACJ;SACJ;aAAM;YACH,IAAI,CAAC,aAAa,GAAG,CAAC,WAAW,CAAC,CAAC;SACtC;IACL,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACtE,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAED,oBAAoB;QAChB,8DAA8D;QAC9D,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,wCAAqB,EAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,wCAAqB,EAAC,IAAI,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;CACJ;AAlMD,wBAkMC"}

package/dist/analyzer/symbolUtils.d.ts

@@ -3,3 +3,4 @@ import { Symbol } from './symbol';
 export declare function getLastTypedDeclaredForSymbol(symbol: Symbol): Declaration | undefined;
 export declare function isTypedDictMemberAccessedThroughIndex(symbol: Symbol): boolean;
 export declare function isVisibleExternally(symbol: Symbol): boolean;
+export declare function isEffectivelyClassVar(symbol: Symbol, isInDataclass: boolean): boolean;

package/dist/analyzer/symbolUtils.js

@@ -8,7 +8,7 @@
  * Functions that operate on Symbol objects.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVisibleExternally = exports.isTypedDictMemberAccessedThroughIndex = exports.getLastTypedDeclaredForSymbol = void 0;
+exports.isEffectivelyClassVar = exports.isVisibleExternally = exports.isTypedDictMemberAccessedThroughIndex = exports.getLastTypedDeclaredForSymbol = void 0;
 function getLastTypedDeclaredForSymbol(symbol) {
     const typedDecls = symbol.getTypedDeclarations();
     if (typedDecls.length > 0) {
@@ -34,4 +34,14 @@ function isVisibleExternally(symbol) {
     return !symbol.isExternallyHidden() && !symbol.isPrivatePyTypedImport();
 }
 exports.isVisibleExternally = isVisibleExternally;
+function isEffectivelyClassVar(symbol, isInDataclass) {
+    if (symbol.isClassVar()) {
+        return true;
+    }
+    if (symbol.isFinalVarInClassBody()) {
+        return !isInDataclass;
+    }
+    return false;
+}
+exports.isEffectivelyClassVar = isEffectivelyClassVar;
 //# sourceMappingURL=symbolUtils.js.map

package/dist/analyzer/symbolUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"symbolUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/symbolUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAKH,SAAgB,6BAA6B,CAAC,MAAc;IACxD,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAEjD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC5C;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AARD,sEAQC;AAED,mEAAmE;AACnE,0EAA0E;AAC1E,SAAgB,qCAAqC,CAAC,MAAc;IAChE,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAEjD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACnD,IAAI,QAAQ,CAAC,IAAI,qCAA6B,EAAE;YAC5C,OAAO,IAAI,CAAC;SACf;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAXD,sFAWC;AAED,SAAgB,mBAAmB,CAAC,MAAc;IAC9C,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;AAC5E,CAAC;AAFD,kDAEC"}
+{"version":3,"file":"symbolUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/symbolUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAKH,SAAgB,6BAA6B,CAAC,MAAc;IACxD,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAEjD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC5C;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AARD,sEAQC;AAED,mEAAmE;AACnE,0EAA0E;AAC1E,SAAgB,qCAAqC,CAAC,MAAc;IAChE,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAEjD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACnD,IAAI,QAAQ,CAAC,IAAI,qCAA6B,EAAE;YAC5C,OAAO,IAAI,CAAC;SACf;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAXD,sFAWC;AAED,SAAgB,mBAAmB,CAAC,MAAc;IAC9C,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;AAC5E,CAAC;AAFD,kDAEC;AAED,SAAgB,qBAAqB,CAAC,MAAc,EAAE,aAAsB;IACxE,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE;QACrB,OAAO,IAAI,CAAC;KACf;IAED,IAAI,MAAM,CAAC,qBAAqB,EAAE,EAAE;QAChC,OAAO,CAAC,aAAa,CAAC;KACzB;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAVD,sDAUC"}

package/dist/analyzer/typeDocStringUtils.js

@@ -264,7 +264,7 @@ function _getPropertyDocStringInherited(decl, sourceMapper, evaluator, classType
         if (!(0, types_1.isInstantiableClass)(mroClass)) {
             continue;
         }
-        const symbol = mroClass.details.fields.get(fieldName);
+        const symbol = types_1.ClassType.getSymbolTable(mroClass).get(fieldName);
         // Get both the setter and getter declarations
         const decls = symbol === null || symbol === void 0 ? void 0 : symbol.getDeclarations();
         if (decls) {

package/dist/analyzer/typeDocStringUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeDocStringUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/typeDocStringUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,yDAUiC;AACjC,2EAA6D;AAC7D,2DAAoE;AACpE,6CAU2B;AAC3B,+DAAsE;AAItE,2CAMqB;AAErB,MAAM,qCAAqC,GACvC;kDACqC;+CACF;gDACA,CAAC;AAExC,SAAS,sBAAsB,CAAC,IAA2C,EAAE,SAAqB;IAC9F,IAAI,IAAI,CAAC,QAAQ,4CAAoC,EAAE;QACnD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC5B;IAED,+DAA+D;IAC/D,+BAA+B;IAC/B,OAAO,CACH,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW;QAC1B,iBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAC7C,CAAC,CAAC,IAAI,CAAC,WAAW;QAClB,CAAC,iBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CACzC,CAAC;AACN,CAAC;AAED,SAAgB,6BAA6B,CACzC,IAAkB,EAClB,YAAqC,EACrC,YAA0B,EAC1B,SAAqB;IAErB,IAAI,SAA6B,CAAC;IAElC,uEAAuE;IACvE,sEAAsE;IACtE,yCAAyC;IACzC,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,YAAY,IAAI,IAAA,mCAAqB,EAAC,YAAY,CAAC,EAAE;QACjG,SAAS,GAAG,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;KACvE;IAED,aAAa;IACb,IAAI,CAAC,SAAS,IAAI,SAAS,EAAE;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QACnC,MAAM,cAAc,GAAG,IAAA,kCAAsB,EAAC,SAAS,EAAE,QAAQ,EAAE,qCAAqC,CAAC,CAAC;QAE1G,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;YACtC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YACnD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxE,IAAI,IAAA,mCAAqB,EAAC,aAAa,CAAC,EAAE;oBACtC,SAAS,GAAG,oCAAoC,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;oBAC9E,IAAI,SAAS,EAAE;wBACX,MAAM;qBACT;iBACJ;aACJ;SACJ;KACJ;IAED,OAAO,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;AAC/C,CAAC;AAnCD,sEAmCC;AAED,SAAgB,wCAAwC,CACpD,IAA4B,EAC5B,aAA4B,EAC5B,YAA0B,EAC1B,SAAwB,EACxB,SAAqB;;IAErB,IAAI,UAAgC,CAAC;IAErC,uEAAuE;IACvE,sEAAsE;IACtE,yCAAyC;IACzC,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;QAC1C,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACtC,UAAU,GAAG,gCAAgC,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;YAChF,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrC,OAAO,UAAU,CAAC;aACrB;SACJ;KACJ;IAED,aAAa;IACb,IAAI,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;QAChD,MAAM,cAAc,GAAG,IAAA,kCAAsB,EAAC,SAAS,EAAE,QAAQ,EAAE,qCAAqC,CAAC,CAAC;QAE1G,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;YACtC,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAA,SAAS,CAAC,qBAAqB,CAAC,aAAa,CAAC,0CAAE,IAAI,CAAC;YACtE,IAAI,QAAQ,EAAE;gBACV,UAAU,GAAG,gCAAgC,CAAC,QAAQ,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;gBACrF,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrC,MAAM;iBACT;aACJ;SACJ;KACJ;IAED,OAAO,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC;AAC5B,CAAC;AAvCD,4FAuCC;AAED,SAAgB,6BAA6B,CACzC,IAAyB,EACzB,YAA0B,EAC1B,SAAwB;IAExB,MAAM,cAAc,GAAG,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACpG,MAAM,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,IAAI,YAAY,EAAE;QACd,OAAO,8BAA8B,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;KAChG;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAXD,sEAWC;AAED,SAAgB,+BAA+B,CAAC,IAAyB,EAAE,YAA0B;IACjG,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,IAAI,CAAC,IAAA,yBAAU,EAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,UAAU,CAAC;KACrB;IAED,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE;QACxD,IAAI,IAAA,mCAAqB,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE;YACzD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SACvC;aAAM,IAAI,IAAA,gCAAkB,EAAC,QAAQ,CAAC,IAAI,IAAA,mCAAqB,EAAC,QAAQ,CAAC,EAAE;YACxE,wGAAwG;YACxG,qEAAqE;YACrE,MAAM,SAAS,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,SAAS,EAAE;gBACX,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC9B;SACJ;KACJ;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AApBD,0EAoBC;AAED,SAAgB,iCAAiC,CAAC,OAAqB;IACnE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC1B,IAAI,MAAM,CAAC,UAAU,EAAE;YACnB,MAAM,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACjE,IAAI,SAAS,EAAE;gBACX,OAAO,SAAS,CAAC;aACpB;SACJ;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAXD,8EAWC;AAED,SAAgB,0BAA0B,CAAC,IAAW,EAAE,YAA0B;IAC9E,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACpB,IAAI,IAAA,yBAAU,EAAC,GAAG,CAAC,EAAE;YACjB,IAAA,8BAAY,EAAC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;SAC1D;QAED,IAAA,6BAAW,EAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;KACvD;IAED,OAAO,iCAAiC,CAAC,OAAO,CAAC,CAAC;AACtD,CAAC;AAXD,gEAWC;AAED,SAAgB,kBAAkB,CAC9B,IAAgB,EAChB,YAAyC,EACzC,YAA0B;;IAE1B,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAC/B,IAAI,CAAC,SAAS,EAAE;QACZ,MAAM,GAAG,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,mCAAI,IAAI,CAAC,OAAO,CAAC;QAC9C,SAAS,GAAG,0BAA0B,CAAC,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;KAC/D;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAZD,gDAYC;AAED,SAAgB,iBAAiB,CAC7B,SAAoB,EACpB,YAAqC,EACrC,YAA0B;IAE1B,IAAI,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;IAC5C,IAAI,CAAC,SAAS,IAAI,YAAY,IAAI,IAAA,gCAAkB,EAAC,YAAY,CAAC,EAAE;QAChE,SAAS,GAAG,iCAAiC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS,IAAI,YAAY,IAAI,IAAA,yBAAU,EAAC,YAAY,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,IAAI,kCAA0B,EAAE;YAC3G,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBAChE,IAAI,IAAA,mCAAqB,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE;oBACzD,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;oBAC/B,MAAM;iBACT;gBAED,IAAI,IAAA,gCAAkB,EAAC,QAAQ,CAAC,IAAI,IAAA,mCAAqB,EAAC,QAAQ,CAAC,EAAE;oBACjE,SAAS,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;oBACtD,MAAM;iBACT;aACJ;SACJ;KACJ;IAED,IAAI,CAAC,SAAS,IAAI,YAAY,EAAE;QAC5B,MAAM,SAAS,GAAG,YAAY,CAAC,2BAA2B,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACxF,IAAI,SAAS,EAAE;YACX,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gCAAkB,EAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAChF,SAAS,GAAG,iCAAiC,CAAC,UAAU,CAAC,CAAC;SAC7D;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAhCD,8CAgCC;AAED,SAAgB,+BAA+B,CAAC,IAA4C;;IACxF,OAAO,cAAc,CAAC,YAAY,CAAC,MAAA,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,KAAK,0CAAE,UAAU,mCAAI,EAAE,CAAC,CAAC;AAC3E,CAAC;AAFD,0EAEC;AAED,SAAgB,oBAAoB,CAChC,IAAqC,EACrC,YAA0B;IAE1B,IAAI,CAAC,IAAI,EAAE;QACP,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC;KACzB;SAAM;QACH,OAAO,+BAA+B,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;KACjF;AACL,CAAC;AAbD,oDAaC;AAED,SAAS,gCAAgC,CACrC,IAAU,EACV,YAAqC,EACrC,YAA0B;IAE1B,IAAI,CAAC,IAAA,4BAAoB,EAAC,IAAI,CAAC,EAAE;QAC7B,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACjD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChC,IAAI,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC5B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAC/C;QACL,CAAC,CAAC,CAAC;KACN;SAAM,IAAI,YAAY,IAAI,IAAA,yBAAU,EAAC,YAAY,CAAC,GAAG,CAAC,IAAI,IAAA,mCAAqB,EAAC,YAAY,CAAC,EAAE;QAC5F,MAAM,SAAS,GAAG,YAAY,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,iCAAiC,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,SAAS,EAAE;YACX,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9B;KACJ;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,8BAA8B,CACnC,IAA6B,EAC7B,YAA0B,EAC1B,SAAwB,EACxB,SAAoB;;IAEpB,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,mCAAqB,EAAC,IAAI,CAAC,EAAE;QACvC,OAAO;KACV;IAED,MAAM,YAAY,GAAG,MAAA,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,0CAAE,IAAI,CAAC;IACjE,IAAI,CAAC,YAAY,IAAI,CAAC,IAAA,qCAAyB,EAAC,YAAY,CAAC,EAAE;QAC3D,OAAO;KACV;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,oCAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACnG,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO;KACV;IAED,MAAM,QAAQ,GAAG,IAAA,4BAAgB,EAAC,SAAS,qCAA6B,CAAC;IACzE,qFAAqF;IACrF,KAAK,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,EAAE;QAC/B,IAAI,CAAC,IAAA,2BAAmB,EAAC,QAAQ,CAAC,EAAE;YAChC,SAAS;SACZ;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtD,8CAA8C;QAC9C,MAAM,KAAK,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,EAAE,CAAC;QACxC,IAAI,KAAK,EAAE;YACP,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACtB,IAAI,IAAA,mCAAqB,EAAC,IAAI,CAAC,EAAE;oBAC7B,MAAM,YAAY,GAAG,MAAA,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,0CAAE,IAAI,CAAC;oBACjE,IAAI,YAAY,IAAI,IAAA,qCAAyB,EAAC,YAAY,CAAC,EAAE;wBACzD,MAAM,SAAS,GAAG,oCAAoC,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;wBAC3E,IAAI,SAAS,EAAE;4BACX,OAAO,SAAS,CAAC;yBACpB;qBACJ;iBACJ;aACJ;SACJ;KACJ;IAED,OAAO;AACX,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,YAA6C,EAAE,YAA0B;IAChH,IAAI,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,EAAE;QACnB,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACvC,IAAI,CAAC,SAAS,IAAI,YAAY,EAAE;QAC5B,SAAS,GAAG,oCAAoC,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;KAChF;IAED,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxC,SAAS,GAAG,oCAAoC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;KAC5F;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,oCAAoC,CAAC,YAAiC,EAAE,YAA0B;IACvG,IAAI,SAAS,GAAG,iCAAiC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAClE,IAAI,CAAC,SAAS,IAAI,IAAA,yBAAU,EAAC,YAAY,CAAC,GAAG,CAAC,EAAE;QAC5C,MAAM,SAAS,GAAG,YAAY,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;QACtE,SAAS,GAAG,iCAAiC,CAAC,SAAS,CAAC,CAAC;KAC5D;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,iCAAiC,CAAC,KAAiD;IACxF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,MAAM,SAAS,GAAG,+BAA+B,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,SAAS,EAAE;YACX,OAAO,SAAS,CAAC;SACpB;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}
+{"version":3,"file":"typeDocStringUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/typeDocStringUtils.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/typeEvaluator.js

@@ -2282,7 +2282,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     // Assignments to instance or class variables through "self" or "cls" is not
                     // allowed for protocol classes unless it is also declared within the class.
                     if (types_1.ClassType.isProtocolClass(classTypeResults.classType)) {
-                        const memberSymbol = classTypeResults.classType.details.fields.get(target.memberName.value);
+                        const memberSymbol = types_1.ClassType.getSymbolTable(classTypeResults.classType).get(target.memberName.value);
                         if (memberSymbol) {
                             const classLevelDecls = memberSymbol.getDeclarations().filter((decl) => {
                                 return !ParseTreeUtils.getEnclosingFunction(decl.node);
@@ -2323,7 +2323,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const classTypeInfo = getTypeOfClass(classDef);
         if (classTypeInfo && (0, types_1.isInstantiableClass)(classTypeInfo.classType)) {
             let memberInfo = (0, typeUtils_1.lookUpClassMember)(classTypeInfo.classType, memberName, isInstanceMember ? 0 /* MemberAccessFlags.Default */ : 16 /* MemberAccessFlags.SkipInstanceMembers */);
-            const memberFields = classTypeInfo.classType.details.fields;
+            const memberFields = types_1.ClassType.getSymbolTable(classTypeInfo.classType);
             if (memberInfo) {
                 // Are we accessing an existing member on this class, or is
                 // it a member on a parent class?
@@ -2331,12 +2331,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const isThisClass = memberClass && types_1.ClassType.isSameGenericClass(classTypeInfo.classType, memberClass);
                 // Check for an attempt to write to an instance variable that is
                 // not defined by __slots__.
-                if (isThisClass && isInstanceMember) {
-                    if ((memberClass === null || memberClass === void 0 ? void 0 : memberClass.details.inheritedSlotsNames) && memberClass.details.localSlotsNames) {
+                if (isThisClass && isInstanceMember && memberClass) {
+                    const inheritedSlotsNames = types_1.ClassType.getInheritedSlotsNames(memberClass);
+                    if (inheritedSlotsNames && memberClass.details.localSlotsNames) {
                         // Skip this check if the local slots is specified but empty because this pattern
                         // is used in a legitimate manner for mix-in classes.
                         if (memberClass.details.localSlotsNames.length > 0 &&
-                            !memberClass.details.inheritedSlotsNames.some((name) => name === memberName)) {
+                            !inheritedSlotsNames.some((name) => name === memberName)) {
                             // Determine whether the assignment corresponds to a descriptor
                             // that was assigned as a class variable. If so, then slots will not
                             // apply in this case.
@@ -3771,6 +3772,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if (usage.setExpectedTypeDiag) {
                     diag = usage.setExpectedTypeDiag;
                 }
+                // If the class is a TypedDict, and there's a key with the same name,
+                // suggest that they user want to use ["key"] name instead.
+                if ((0, types_1.isClass)(baseType) && baseType.details.typedDictEntries) {
+                    const tdKey = baseType.details.typedDictEntries.knownItems.get(memberName);
+                    if (tdKey) {
+                        const subDiag = new diagnostic_1.DiagnosticAddendum();
+                        subDiag.addMessage(localize_1.LocAddendum.typedDictKeyAccess().format({ name: memberName }));
+                        diag.addAddendum(subDiag);
+                    }
+                }
                 const rule = isFunctionRule
                     ? diagnosticRules_1.DiagnosticRule.reportFunctionMemberAccess
                     : diagnosticRules_1.DiagnosticRule.reportAttributeAccessIssue;
@@ -3842,7 +3853,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     // this is normally considered a type violation. But it is allowed
                     // if the class variable is a descriptor object. In this case, we will
                     // clear the flag that causes an error to be generated.
-                    if (usage.method === 'set' && memberInfo.symbol.isClassVar() && isAccessedThroughObject) {
+                    if (usage.method === 'set' &&
+                        (0, symbolUtils_1.isEffectivelyClassVar)(memberInfo.symbol, types_1.ClassType.isDataClass(containingClassType)) &&
+                        isAccessedThroughObject) {
                         const selfClass = (selfType !== null && selfType !== void 0 ? selfType : memberName === '__new__') ? undefined : classType;
                         const typeResult = getTypeOfMemberInternal(errorNode, memberInfo, selfClass, flags);
                         if (typeResult) {
@@ -3942,7 +3955,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             // Check for an attempt to overwrite or delete a ClassVar member from an instance.
             if (!isDescriptorApplied &&
-                (memberInfo === null || memberInfo === void 0 ? void 0 : memberInfo.symbol.isClassVar()) &&
+                memberInfo &&
+                (0, symbolUtils_1.isEffectivelyClassVar)(memberInfo.symbol, types_1.ClassType.isDataClass(classType)) &&
                 (flags & 128 /* MemberAccessFlags.DisallowClassVarWrites */) !== 0) {
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.memberSetClassVar().format({ name: memberName }));
                 isDescriptorError = true;
@@ -6620,7 +6634,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // are more complicated and depend on whether the method is defined in a stub file.
     function getAbstractSymbolInfo(classType, symbolName) {
         const isProtocolClass = types_1.ClassType.isProtocolClass(classType);
-        const symbol = classType.details.fields.get(symbolName);
+        const symbol = types_1.ClassType.getSymbolTable(classType).get(symbolName);
         if (!symbol) {
             return undefined;
         }
@@ -9109,7 +9123,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 hasDeclaredType: true,
             });
             initType.details.declaredReturnType = getNoneType();
-            classType.details.fields.set('__init__', symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, initType));
+            types_1.ClassType.getSymbolTable(classType).set('__init__', symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, initType));
             // Synthesize a trivial __new__ method.
             const newType = types_1.FunctionType.createSynthesizedInstance('__new__', 1 /* FunctionTypeFlags.ConstructorMethod */);
             types_1.FunctionType.addParameter(newType, {
@@ -9121,7 +9135,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             types_1.FunctionType.addDefaultParameters(newType);
             newType.details.declaredReturnType = types_1.ClassType.cloneAsInstance(classType);
             newType.details.constructorTypeVarScopeId = classType.details.typeVarScopeId;
-            classType.details.fields.set('__new__', symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, newType));
+            types_1.ClassType.getSymbolTable(classType).set('__new__', symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, newType));
         }
         return classType;
     }
@@ -9701,7 +9715,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             return undefined;
         }
         const specializedListOrSet = (0, typeUtils_1.applySolvedTypeVars)(expectedClassType, typeVarContext);
-        if (!specializedListOrSet.typeArguments || specializedListOrSet.typeArguments.length !== 1) {
+        if (!specializedListOrSet.typeArguments) {
             return undefined;
         }
         return specializedListOrSet.typeArguments[0];
@@ -10051,7 +10065,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (ParseTreeUtils.containsAwaitNode(node.expression)) {
             isAsync = true;
         }
-        const expectedEntryType = getExpectedEntryTypeForIterable(node, getTypingType(node, 'Iterable'), inferenceContext);
+        const builtInIteratorType = getTypingType(node, isAsync ? 'AsyncGenerator' : 'Generator');
+        const expectedEntryType = getExpectedEntryTypeForIterable(node, builtInIteratorType, inferenceContext);
         const elementTypeResult = getElementTypeFromListComprehension(node, expectedEntryType);
         if (elementTypeResult.isIncomplete) {
             isIncomplete = true;
@@ -10059,8 +10074,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (elementTypeResult.typeErrors) {
             typeErrors = true;
         }
-        const elementType = elementTypeResult.type;
-        const builtInIteratorType = getTypingType(node, isAsync ? 'AsyncGenerator' : 'Generator');
+        let elementType = elementTypeResult.type;
+        if (!expectedEntryType || !(0, typeUtils_1.containsLiteralType)(expectedEntryType)) {
+            elementType = stripLiteralValue(elementType);
+        }
         if (builtInIteratorType && (0, types_1.isInstantiableClass)(builtInIteratorType)) {
             type = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(builtInIteratorType, isAsync ? [elementType, getNoneType()] : [elementType, getNoneType(), getNoneType()], 
             /* isTypeArgumentExplicit */ true));
@@ -11054,6 +11071,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (aliasMapEntry.isSpecialForm) {
             specialClassType.details.flags |= -2147483648 /* ClassTypeFlags.SpecialFormClass */;
         }
+        // Synthesize a single type parameter with the specified variance if
+        // specified in the alias map entry.
+        if (aliasMapEntry.typeParamVariance !== undefined) {
+            let typeParam = types_1.TypeVarType.createInstance('T');
+            typeParam = types_1.TypeVarType.cloneForScopeId(typeParam, ParseTreeUtils.getScopeIdForNode(node), assignedName, 0 /* TypeVarScopeType.Class */);
+            typeParam.details.declaredVariance = aliasMapEntry.typeParamVariance;
+            specialClassType.details.typeParameters.push(typeParam);
+        }
         const specialBuiltInClassDeclaration = ((_a = AnalyzerNodeInfo.getDeclaration(node)) !== null && _a !== void 0 ? _a : (node.parent ? AnalyzerNodeInfo.getDeclaration(node.parent) : undefined));
         specialClassType.details.declaration = specialBuiltInClassDeclaration;
         if (fileInfo.isTypingExtensionsStubFile) {
@@ -11124,7 +11149,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             ['Annotated', { alias: '', module: 'builtins', isSpecialForm: true }],
             ['TypeAlias', { alias: '', module: 'builtins', isSpecialForm: true }],
             ['Concatenate', { alias: '', module: 'builtins', isSpecialForm: true }],
-            ['TypeGuard', { alias: '', module: 'builtins', isSpecialForm: true }],
+            [
+                'TypeGuard',
+                { alias: '', module: 'builtins', isSpecialForm: true, typeParamVariance: 3 /* Variance.Covariant */ },
+            ],
             ['Unpack', { alias: '', module: 'builtins', isSpecialForm: true }],
             ['Required', { alias: '', module: 'builtins', isSpecialForm: true }],
             ['NotRequired', { alias: '', module: 'builtins', isSpecialForm: true }],
@@ -11133,7 +11161,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             ['Never', { alias: '', module: 'builtins', isSpecialForm: true }],
             ['LiteralString', { alias: '', module: 'builtins', isSpecialForm: true }],
             ['ReadOnly', { alias: '', module: 'builtins', isSpecialForm: true }],
-            ['TypeIs', { alias: '', module: 'builtins', isSpecialForm: true }],
+            ['TypeIs', { alias: '', module: 'builtins', isSpecialForm: true, typeParamVariance: 2 /* Variance.Invariant */ }],
         ]);
         const aliasMapEntry = specialTypes.get(assignedName);
         if (aliasMapEntry) {
@@ -11511,6 +11539,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // all of the type parameters in the specified order.
             let genericTypeParameters;
             let protocolTypeParameters;
+            let isNamedTupleSubclass = false;
             const initSubclassArgs = [];
             let metaclassNode;
             let exprFlags = 128 /* EvaluatorFlags.ExpectingInstantiableType */ |
@@ -11590,6 +11619,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             // newer), it's considered a (read-only) dataclass.
                             if (fileInfo.executionEnvironment.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_6)) {
                                 if (types_1.ClassType.isBuiltIn(argType, 'NamedTuple')) {
+                                    isNamedTupleSubclass = true;
                                     classType.details.flags |=
                                         4 /* ClassTypeFlags.DataClass */ |
                                             32 /* ClassTypeFlags.SkipSynthesizedDataClassEq */ |
@@ -11948,46 +11978,62 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // See if there's already a non-synthesized __init__ method.
                 // We shouldn't override it.
                 if (!skipSynthesizedInit) {
-                    const initSymbol = (0, typeUtils_1.lookUpClassMember)(classType, '__init__', 2 /* MemberAccessFlags.SkipBaseClasses */);
-                    if (initSymbol) {
+                    const initSymbol = classType.details.fields.get('__init__');
+                    if (initSymbol && initSymbol.isClassMember()) {
                         hasExistingInitMethod = true;
                     }
                 }
                 let skipSynthesizeHash = false;
-                const hashSymbol = (0, typeUtils_1.lookUpClassMember)(classType, '__hash__', 2 /* MemberAccessFlags.SkipBaseClasses */);
+                const hashSymbol = classType.details.fields.get('__hash__');
                 // If there is a hash symbol defined in the class (i.e. one that we didn't
                 // synthesize above), then we shouldn't synthesize a new one for the dataclass.
-                if (hashSymbol && !hashSymbol.symbol.getSynthesizedType()) {
+                if (hashSymbol && hashSymbol.isClassMember() && !hashSymbol.getSynthesizedType()) {
                     skipSynthesizeHash = true;
                 }
-                (0, dataClasses_1.synthesizeDataClassMethods)(evaluatorInterface, node, classType, skipSynthesizedInit, hasExistingInitMethod, skipSynthesizeHash);
+                const synthesizeMethods = () => (0, dataClasses_1.synthesizeDataClassMethods)(evaluatorInterface, node, classType, skipSynthesizedInit, hasExistingInitMethod, skipSynthesizeHash);
+                // If this is a NamedTuple subclass, immediately synthesize dataclass methods
+                // because we also need to update the MRO classes in this case. For regular
+                // dataclasses, we'll defer the  method synthesis to avoid circular dependencies.
+                if (isNamedTupleSubclass) {
+                    synthesizeMethods();
+                }
+                else {
+                    classType.details.synthesizeMethodsDeferred = () => {
+                        delete classType.details.synthesizeMethodsDeferred;
+                        synthesizeMethods();
+                    };
+                }
             }
             // Build a complete list of all slots names defined by the class hierarchy.
             // This needs to be done after dataclass processing.
-            if (classType.details.localSlotsNames) {
-                let isLimitedToSlots = true;
-                const extendedSlotsNames = Array.from(classType.details.localSlotsNames);
-                classType.details.baseClasses.forEach((baseClass) => {
-                    if ((0, types_1.isInstantiableClass)(baseClass)) {
-                        if (!types_1.ClassType.isBuiltIn(baseClass, 'object') &&
-                            !types_1.ClassType.isBuiltIn(baseClass, 'type') &&
-                            !types_1.ClassType.isBuiltIn(baseClass, 'Generic')) {
-                            if (baseClass.details.inheritedSlotsNames === undefined) {
-                                isLimitedToSlots = false;
-                            }
-                            else {
-                                (0, collectionUtils_1.appendArray)(extendedSlotsNames, baseClass.details.inheritedSlotsNames);
+            classType.details.calculateInheritedSlotsNamesDeferred = () => {
+                delete classType.details.calculateInheritedSlotsNamesDeferred;
+                if (classType.details.localSlotsNames) {
+                    let isLimitedToSlots = true;
+                    const extendedSlotsNames = Array.from(classType.details.localSlotsNames);
+                    classType.details.baseClasses.forEach((baseClass) => {
+                        if ((0, types_1.isInstantiableClass)(baseClass)) {
+                            if (!types_1.ClassType.isBuiltIn(baseClass, 'object') &&
+                                !types_1.ClassType.isBuiltIn(baseClass, 'type') &&
+                                !types_1.ClassType.isBuiltIn(baseClass, 'Generic')) {
+                                const inheritedSlotsNames = types_1.ClassType.getInheritedSlotsNames(baseClass);
+                                if (inheritedSlotsNames) {
+                                    (0, collectionUtils_1.appendArray)(extendedSlotsNames, inheritedSlotsNames);
+                                }
+                                else {
+                                    isLimitedToSlots = false;
+                                }
                             }
                         }
+                        else {
+                            isLimitedToSlots = false;
+                        }
+                    });
+                    if (isLimitedToSlots) {
+                        classType.details.inheritedSlotsNamesCached = extendedSlotsNames;
                     }
-                    else {
-                        isLimitedToSlots = false;
-                    }
-                });
-                if (isLimitedToSlots) {
-                    classType.details.inheritedSlotsNames = extendedSlotsNames;
                 }
-            }
+            };
             // Update the undecorated class type.
             writeTypeCache(node.name, { type: classType }, 0 /* EvaluatorFlags.None */);
             // Update the decorated class type.
@@ -12841,7 +12887,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             // of the child class.
                             if ((0, typeUtils_1.requiresSpecialization)(inferredParamType) && (0, types_1.isClass)(baseClassMemberInfo.classType)) {
                                 const typeVarContext = (0, typeUtils_1.buildTypeVarContextFromSpecializedClass)(baseClassMemberInfo.classType);
-                                inferredParamType = (0, typeUtils_1.applySolvedTypeVars)(inferredParamType, typeVarContext);
+                                // Add the scope of the method to handle any function-scoped TypeVars.
+                                typeVarContext.addSolveForScope(ParseTreeUtils.getScopeIdForNode(baseClassMethodNode));
+                                // Replace any unsolved TypeVars with Unknown (including all function-scoped TypeVars).
+                                inferredParamType = (0, typeUtils_1.applySolvedTypeVars)(inferredParamType, typeVarContext, {
+                                    unknownIfNotFound: true,
+                                });
                             }
                             const fileInfo = AnalyzerNodeInfo.getFileInfo(functionNode);
                             if (fileInfo.isInPyTypedPackage && !fileInfo.isStubFile) {
@@ -15501,7 +15552,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // If the symbol is explicitly marked as a ClassVar, consider only the
             // declarations that assign to it from within the class body, not through
             // a member access expression.
-            if (symbol.isClassVar() && decl.type === 1 /* DeclarationType.Variable */ && decl.isDefinedByMemberAccess) {
+            if ((0, symbolUtils_1.isEffectivelyClassVar)(symbol, /* isDataclass */ false) &&
+                decl.type === 1 /* DeclarationType.Variable */ &&
+                decl.isDefinedByMemberAccess) {
                 return;
             }
             if (usageNode !== undefined) {
@@ -16152,7 +16205,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // Stash the current class type so any references to it are treated
             // as though all TypeParameters are invariant.
             assignClassToSelfStack.push({ class: destType, assumedVariance });
-            destType.details.fields.forEach((symbol, name) => {
+            types_1.ClassType.getSymbolTable(destType).forEach((symbol, name) => {
                 if (!isAssignable || symbol.isIgnoredForProtocolMatch()) {
                     return;
                 }
@@ -16989,7 +17042,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
             else if (types_1.ClassType.isBuiltIn(destType, ['TypeGuard', 'TypeIs'])) {
-                // All the source to be a "bool".
+                // Allow the source to be a "bool".
                 if ((originalFlags & 128 /* AssignTypeFlags.AllowBoolTypeGuard */) !== 0) {
                     if ((0, types_1.isClassInstance)(srcType) && types_1.ClassType.isBuiltIn(srcType, 'bool')) {
                         return true;
@@ -17601,11 +17654,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // a normal function wouldn't be compatible with.
         for (const mroClass of objType.details.mro) {
             if ((0, types_1.isClass)(mroClass) && types_1.ClassType.isProtocolClass(mroClass)) {
-                for (const field of mroClass.details.fields) {
+                for (const field of types_1.ClassType.getSymbolTable(mroClass)) {
                     if (field[0] !== '__call__' && !field[1].isIgnoredForProtocolMatch()) {
                         let fieldIsPartOfFunction = false;
                         if (functionObj && (0, types_1.isClass)(functionObj)) {
-                            if (functionObj.details.fields.has(field[0])) {
+                            if (types_1.ClassType.getSymbolTable(functionObj).has(field[0])) {
                                 fieldIsPartOfFunction = true;
                             }
                         }
@@ -18820,7 +18873,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // See if this class is introducing a new abstract symbol that has not been
                 // introduced previously or if it is overriding an abstract symbol with
                 // a non-abstract one.
-                mroClass.details.fields.forEach((symbol, symbolName) => {
+                types_1.ClassType.getSymbolTable(mroClass).forEach((symbol, symbolName) => {
                     const abstractSymbolInfo = getAbstractSymbolInfo(mroClass, symbolName);
                     if (abstractSymbolInfo) {
                         symbolTable.set(symbolName, abstractSymbolInfo);
@@ -19069,11 +19122,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (node.strings[0].nodeType === 49 /* ParseNodeType.String */) {
             valueOffset += node.strings[0].token.prefixLength + node.strings[0].token.quoteMarkLength;
         }
+        // Construct a temporary dummy string with the text value at the appropriate
+        // offset so as to mimic the original file. This will keep all of the token
+        // and diagnostic offsets correct.
+        const dummyFileContents = ' '.repeat(valueOffset) + textValue;
         const parseOptions = new parser_1.ParseOptions();
         parseOptions.isStubFile = fileInfo.isStubFile;
         parseOptions.pythonVersion = fileInfo.executionEnvironment.pythonVersion;
         parseOptions.reportErrorsForParsedStringContents = true;
-        const parseResults = parser.parseTextExpression(fileInfo.fileContents, valueOffset, textValue.length, parseOptions, 
+        const parseResults = parser.parseTextExpression(dummyFileContents, valueOffset, textValue.length, parseOptions, 
         /* parseTextMode */ undefined, 
         /* initialParenDepth */ undefined, fileInfo.typingSymbolAliases);
         if (parseResults.parseTree && parseResults.parseTree.nodeType !== 62 /* ParseNodeType.FunctionAnnotation */) {