@zzzen/pyright-internal 1.2.0-dev.20230305 → 1.2.0-dev.20230319

package/dist/analyzer/cacheManager.d.ts

@@ -4,9 +4,13 @@ export interface CacheOwner {
     emptyCache(): void;
 }
 export declare class CacheManager {
+    private _pausedCount;
     private readonly _cacheOwners;
     registerCacheOwner(provider: CacheOwner): void;
     unregisterCacheOwner(provider: CacheOwner): void;
+    pauseTracking(): {
+        dispose(): void;
+    };
     getCacheUsage(): number;
     emptyCache(console?: ConsoleInterface): void;
     getUsedHeapRatio(console?: ConsoleInterface): number;

package/dist/analyzer/cacheManager.js

@@ -14,6 +14,7 @@ const debug_1 = require("../common/debug");
 const memUtils_1 = require("../common/memUtils");
 class CacheManager {
     constructor() {
+        this._pausedCount = 0;
         this._cacheOwners = [];
     }
     registerCacheOwner(provider) {
@@ -28,7 +29,19 @@ class CacheManager {
             this._cacheOwners.splice(index, 1);
         }
     }
+    pauseTracking() {
+        const local = this;
+        local._pausedCount++;
+        return {
+            dispose() {
+                local._pausedCount--;
+            },
+        };
+    }
     getCacheUsage() {
+        if (this._pausedCount > 0) {
+            return -1;
+        }
         let totalUsage = 0;
         this._cacheOwners.forEach((p) => {
             totalUsage += p.getCacheUsage();

package/dist/analyzer/cacheManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheManager.js","sourceRoot":"","sources":["../../../src/analyzer/cacheManager.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAGH,2CAAuC;AACvC,iDAAuD;AAWvD,MAAa,YAAY;IAAzB;QACqB,iBAAY,GAAiB,EAAE,CAAC;IA8DrD,CAAC;IA5DG,kBAAkB,CAAC,QAAoB;QACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,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,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;QAEtC,IAAI,OAAO,EAAE;YACT,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,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,OAAO,SAAS,CAAC,cAAc,GAAG,SAAS,CAAC,eAAe,CAAC;IAChE,CAAC;IAEO,YAAY,CAAC,KAAa;QAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;IACpD,CAAC;CACJ;AA/DD,oCA+DC"}
+{"version":3,"file":"cacheManager.js","sourceRoot":"","sources":["../../../src/analyzer/cacheManager.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAGH,2CAAuC;AACvC,iDAAuD;AAWvD,MAAa,YAAY;IAAzB;QACY,iBAAY,GAAG,CAAC,CAAC;QACR,iBAAY,GAAiB,EAAE,CAAC;IA4ErD,CAAC;IA1EG,kBAAkB,CAAC,QAAoB;QACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,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;QAEtC,IAAI,OAAO,EAAE;YACT,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,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,OAAO,SAAS,CAAC,cAAc,GAAG,SAAS,CAAC,eAAe,CAAC;IAChE,CAAC;IAEO,YAAY,CAAC,KAAa;QAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;IACpD,CAAC;CACJ;AA9ED,oCA8EC"}

package/dist/analyzer/checker.d.ts

@@ -123,7 +123,8 @@ export declare class Checker extends ParseTreeWalker {
     private _validateMultipleInheritanceCompatibility;
     private _validateMultipleInheritanceOverride;
     private _validateBaseClassOverrides;
-    private _validateOverrideDecorator;
+    private _validateOverrideDecoratorPresent;
+    private _validateOverrideDecoratorNotPresent;
     private _validateBaseClassOverride;
     private _validateMethod;
     private _validateSuperCallForMethod;

package/dist/analyzer/checker.js

@@ -2561,19 +2561,55 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         let errorMessage;
         let deprecatedMessage;
+        function getDeprecatedMessageForOverloadedCall(evaluator, type) {
+            // Determine if the node is part of a call expression. If so,
+            // we can determine which overload(s) were used to satisfy
+            // the call expression and determine whether any of them
+            // are deprecated.
+            const callNode = ParseTreeUtils.getCallForName(node);
+            if (callNode) {
+                const callTypeResult = evaluator.getTypeResult(callNode);
+                if (callTypeResult &&
+                    callTypeResult.overloadsUsedForCall &&
+                    callTypeResult.overloadsUsedForCall.length > 0) {
+                    callTypeResult.overloadsUsedForCall.forEach((overload) => {
+                        if (overload.details.deprecatedMessage !== undefined) {
+                            if (node.value === overload.details.name) {
+                                deprecatedMessage = overload.details.deprecatedMessage;
+                                errorMessage = localize_1.Localizer.Diagnostic.deprecatedFunction().format({
+                                    name: overload.details.name,
+                                });
+                            }
+                            else if ((0, types_1.isInstantiableClass)(type) && overload.details.name === '__init__') {
+                                deprecatedMessage = overload.details.deprecatedMessage;
+                                errorMessage = localize_1.Localizer.Diagnostic.deprecatedConstructor().format({
+                                    name: type.details.name,
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+        }
         (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
             if ((0, types_1.isClass)(subtype)) {
                 if (!subtype.includeSubclasses &&
                     subtype.details.deprecatedMessage !== undefined &&
                     node.value === subtype.details.name) {
                     deprecatedMessage = subtype.details.deprecatedMessage;
-                    errorMessage = localize_1.Localizer.Diagnostic.deprecatedClass();
+                    errorMessage = localize_1.Localizer.Diagnostic.deprecatedClass().format({ name: subtype.details.name });
+                }
+                else {
+                    // See if this is part of a call to a constructor.
+                    getDeprecatedMessageForOverloadedCall(this._evaluator, subtype);
                 }
             }
             else if ((0, types_1.isFunction)(subtype)) {
                 if (subtype.details.deprecatedMessage !== undefined && node.value === subtype.details.name) {
                     deprecatedMessage = subtype.details.deprecatedMessage;
-                    errorMessage = localize_1.Localizer.Diagnostic.deprecatedFunction();
+                    errorMessage = localize_1.Localizer.Diagnostic.deprecatedFunction().format({
+                        name: subtype.details.name || '<anonymous>',
+                    });
                 }
             }
             else if ((0, types_1.isOverloadedFunction)(subtype)) {
@@ -2581,21 +2617,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 // we can determine which overload(s) were used to satisfy
                 // the call expression and determine whether any of them
                 // are deprecated.
-                const callNode = ParseTreeUtils.getCallForName(node);
-                if (callNode) {
-                    const callTypeResult = this._evaluator.getTypeResult(callNode);
-                    if (callTypeResult &&
-                        callTypeResult.overloadsUsedForCall &&
-                        callTypeResult.overloadsUsedForCall.length > 0) {
-                        callTypeResult.overloadsUsedForCall.forEach((overload) => {
-                            if (overload.details.deprecatedMessage !== undefined &&
-                                node.value === overload.details.name) {
-                                deprecatedMessage = overload.details.deprecatedMessage;
-                                errorMessage = localize_1.Localizer.Diagnostic.deprecatedFunction();
-                            }
-                        });
-                    }
-                }
+                getDeprecatedMessageForOverloadedCall(this._evaluator, subtype);
             }
         });
         if (errorMessage) {
@@ -3679,7 +3701,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             if ((0, types_1.isAnyOrUnknown)(typeOfSymbol)) {
                 return;
             }
-            let foundOverride = false;
+            let firstOverride;
             for (const baseClass of classType.details.baseClasses) {
                 if (!(0, types_1.isClass)(baseClass)) {
                     continue;
@@ -3694,20 +3716,44 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 if (!baseClassAndSymbol) {
                     continue;
                 }
-                foundOverride = true;
+                firstOverride = firstOverride !== null && firstOverride !== void 0 ? firstOverride : baseClassAndSymbol;
                 this._validateBaseClassOverride(baseClassAndSymbol, symbol, typeOfSymbol, classType, name);
             }
-            if (!foundOverride) {
+            if (!firstOverride) {
                 // If this is a method decorated with @override, validate that there
                 // is a base class method of the same name.
-                this._validateOverrideDecorator(typeOfSymbol);
+                this._validateOverrideDecoratorNotPresent(typeOfSymbol);
+            }
+            else {
+                this._validateOverrideDecoratorPresent(typeOfSymbol, firstOverride);
             }
         });
     }
+    _validateOverrideDecoratorPresent(overrideType, baseMember) {
+        // Skip this check if disabled.
+        if (this._fileInfo.diagnosticRuleSet.reportImplicitOverride === 'none') {
+            return;
+        }
+        let overrideFunction;
+        if ((0, types_1.isFunction)(overrideType)) {
+            overrideFunction = overrideType;
+        }
+        else if ((0, types_1.isOverloadedFunction)(overrideType)) {
+            overrideFunction = types_1.OverloadedFunctionType.getImplementation(overrideType);
+        }
+        if (!(overrideFunction === null || overrideFunction === void 0 ? void 0 : overrideFunction.details.declaration) || types_1.FunctionType.isOverridden(overrideFunction)) {
+            return;
+        }
+        const funcNode = overrideFunction.details.declaration.node;
+        this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.overrideDecoratorMissing().format({
+            name: funcNode.name.value,
+            className: this._evaluator.printType((0, typeUtils_1.convertToInstance)(baseMember.classType)),
+        }), funcNode.name);
+    }
     // Determines whether the type is a function or overloaded function with an @override
     // decorator. In this case, an error is reported because no base class has declared
     // a method of the same name.
-    _validateOverrideDecorator(overrideType) {
+    _validateOverrideDecoratorNotPresent(overrideType) {
         let overrideFunction;
         if ((0, types_1.isFunction)(overrideType)) {
             overrideFunction = overrideType;
@@ -3715,13 +3761,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         else if ((0, types_1.isOverloadedFunction)(overrideType)) {
             overrideFunction = types_1.OverloadedFunctionType.getImplementation(overrideType);
         }
-        if (!overrideFunction ||
-            !types_1.FunctionType.isOverridden(overrideFunction) ||
-            !overrideFunction.details.declaration) {
+        if (!(overrideFunction === null || overrideFunction === void 0 ? void 0 : overrideFunction.details.declaration) || !types_1.FunctionType.isOverridden(overrideFunction)) {
             return;
         }
         const funcNode = overrideFunction.details.declaration.node;
-        this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.overrideNotFound().format({ name: funcNode.name.value }), funcNode.name);
+        this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.overriddenMethodNotFound().format({ name: funcNode.name.value }), funcNode.name);
     }
     _validateBaseClassOverride(baseClassAndSymbol, overrideSymbol, overrideType, childClassType, memberName) {
         if (!(0, types_1.isInstantiableClass)(baseClassAndSymbol.classType)) {
@@ -3956,7 +4000,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             // __new__ overrides should have a "cls" parameter.
             if (node.parameters.length === 0 ||
                 !node.parameters[0].name ||
-                !['cls', '_cls', '__cls', '__mcls'].some((name) => node.parameters[0].name.value === name)) {
+                !['cls', '_cls', '__cls', '__mcls', 'mcls', 'mcs'].some((name) => node.parameters[0].name.value === name)) {
                 this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportSelfClsParameterName, diagnosticRules_1.DiagnosticRule.reportSelfClsParameterName, localize_1.Localizer.Diagnostic.newClsParam(), node.parameters.length > 0 ? node.parameters[0] : node.name);
             }
             if (classType) {
@@ -4029,9 +4073,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 }
                 // Instance methods should have a "self" parameter.
                 if (firstParamIsSimple && paramName !== 'self') {
-                    // Special-case metaclasses, which can use "cls".
+                    // Special-case metaclasses, which can use "cls" or several variants.
                     let isLegalMetaclassName = false;
-                    if (paramName === 'cls') {
+                    if (['cls', 'mcls', 'mcs'].some((name) => name === paramName)) {
                         const classTypeInfo = this._evaluator.getTypeOfClass(classNode);
                         const typeType = this._evaluator.getBuiltInType(classNode, 'type');
                         if (typeType &&