@zzzen/pyright-internal 1.2.0-dev.20231001 → 1.2.0-dev.20231008

package/dist/analyzer/checker.d.ts

@@ -103,7 +103,9 @@ export declare class Checker extends ParseTreeWalker {
     private _validateIsInstanceCall;
     private _isTypeSupportedTypeForIsInstance;
     private _isSymbolPrivate;
-    private _reportDeprecatedUse;
+    private _reportDeprecatedUseForMemberAccess;
+    private _reportDeprecatedUseForType;
+    private _reportDeprecatedDiagnostic;
     private _reportUnboundName;
     private _conditionallyReportShadowedModule;
     private _conditionallyReportShadowedImport;

package/dist/analyzer/checker.js

@@ -892,7 +892,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         // Report the use of a deprecated symbol.
         const type = this._evaluator.getType(node);
-        this._reportDeprecatedUse(node, type);
+        this._reportDeprecatedUseForType(node, type);
         return true;
     }
     visitDel(node) {
@@ -903,9 +903,14 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitMemberAccess(node) {
-        const type = this._evaluator.getType(node);
+        var _a;
+        const typeResult = this._evaluator.getTypeResult(node);
+        const type = (_a = typeResult === null || typeResult === void 0 ? void 0 : typeResult.type) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
         const leftExprType = this._evaluator.getType(node.leftExpression);
-        this._reportDeprecatedUse(node.memberName, type, leftExprType && (0, types_1.isModule)(leftExprType) && leftExprType.moduleName === 'typing');
+        this._reportDeprecatedUseForType(node.memberName, type, leftExprType && (0, types_1.isModule)(leftExprType) && leftExprType.moduleName === 'typing');
+        if (typeResult === null || typeResult === void 0 ? void 0 : typeResult.memberAccessDeprecationInfo) {
+            this._reportDeprecatedUseForMemberAccess(node.memberName, typeResult.memberAccessDeprecationInfo);
+        }
         this._conditionallyReportPrivateUsage(node.memberName);
         // Walk the leftExpression but not the memberName.
         this.walk(node.leftExpression);
@@ -977,7 +982,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         const type = this._evaluator.getType((_b = node.alias) !== null && _b !== void 0 ? _b : node.name);
-        this._reportDeprecatedUse(node.name, type, isImportFromTyping);
+        this._reportDeprecatedUseForType(node.name, type, isImportFromTyping);
         return false;
     }
     visitModuleName(node) {
@@ -2541,7 +2546,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         const filterType = (varType) => {
             const filteredTypes = [];
             for (const filterType of classTypeList) {
-                const filterIsSuperclass = (0, typeGuards_1.isIsinstanceFilterSuperclass)(this._evaluator, varType, filterType, filterType, isInstanceCheck);
+                const filterIsSuperclass = (0, typeGuards_1.isIsinstanceFilterSuperclass)(this._evaluator, varType, varType, filterType, filterType, isInstanceCheck);
                 const filterIsSubclass = (0, typeGuards_1.isIsinstanceFilterSubclass)(this._evaluator, varType, filterType, isInstanceCheck);
                 // Normally, a class should never be both a subclass and a
                 // superclass. However, this can happen if one of the classes
@@ -2648,7 +2653,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     }
                     break;
                 case 5 /* Function */:
-                    isSupported = types_1.TypeBase.isInstantiable(subtype);
+                    if (!types_1.TypeBase.isInstantiable(subtype) || subtype.isCallableWithTypeArgs) {
+                        isSupported = false;
+                    }
                     break;
                 case 9 /* Union */:
                     isSupported = this._isTypeSupportedTypeForIsInstance(subtype, isInstanceCheck);
@@ -2677,7 +2684,35 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         return false;
     }
-    _reportDeprecatedUse(node, type, isImportFromTyping = false) {
+    _reportDeprecatedUseForMemberAccess(node, info) {
+        let errorMessage;
+        if (info.accessType === 'property') {
+            if (info.accessMethod === 'get') {
+                errorMessage = localize_1.Localizer.Diagnostic.deprecatedPropertyGetter().format({ name: node.value });
+            }
+            else if (info.accessMethod === 'set') {
+                errorMessage = localize_1.Localizer.Diagnostic.deprecatedPropertySetter().format({ name: node.value });
+            }
+            else {
+                errorMessage = localize_1.Localizer.Diagnostic.deprecatedPropertyDeleter().format({ name: node.value });
+            }
+        }
+        else if (info.accessType === 'descriptor') {
+            if (info.accessMethod === 'get') {
+                errorMessage = localize_1.Localizer.Diagnostic.deprecatedDescriptorGetter().format({ name: node.value });
+            }
+            else if (info.accessMethod === 'set') {
+                errorMessage = localize_1.Localizer.Diagnostic.deprecatedDescriptorSetter().format({ name: node.value });
+            }
+            else {
+                errorMessage = localize_1.Localizer.Diagnostic.deprecatedDescriptorDeleter().format({ name: node.value });
+            }
+        }
+        if (errorMessage) {
+            this._reportDeprecatedDiagnostic(node, errorMessage, info.deprecationMessage);
+        }
+    }
+    _reportDeprecatedUseForType(node, type, isImportFromTyping = false) {
         var _a, _b;
         if (!type) {
             return;
@@ -2765,16 +2800,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         });
         if (errorMessage) {
-            const diag = new diagnostic_1.DiagnosticAddendum();
-            if (deprecatedMessage) {
-                diag.addMessage(deprecatedMessage);
-            }
-            if (this._fileInfo.diagnosticRuleSet.reportDeprecated === 'none') {
-                this._evaluator.addDeprecated(errorMessage + diag.getString(), node);
-            }
-            else {
-                this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportDeprecated, diagnosticRules_1.DiagnosticRule.reportDeprecated, errorMessage + diag.getString(), node);
-            }
+            this._reportDeprecatedDiagnostic(node, errorMessage, deprecatedMessage);
         }
         if (this._fileInfo.diagnosticRuleSet.deprecateTypingAliases) {
             const deprecatedForm = (_a = deprecatedSymbols_1.deprecatedAliases.get(node.value)) !== null && _a !== void 0 ? _a : deprecatedSymbols_1.deprecatedSpecialForms.get(node.value);
@@ -2801,6 +2827,18 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
     }
+    _reportDeprecatedDiagnostic(node, diagnosticMessage, deprecatedMessage) {
+        const diag = new diagnostic_1.DiagnosticAddendum();
+        if (deprecatedMessage) {
+            diag.addMessage(deprecatedMessage);
+        }
+        if (this._fileInfo.diagnosticRuleSet.reportDeprecated === 'none') {
+            this._evaluator.addDeprecated(diagnosticMessage + diag.getString(), node);
+        }
+        else {
+            this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportDeprecated, diagnosticRules_1.DiagnosticRule.reportDeprecated, diagnosticMessage + diag.getString(), node);
+        }
+    }
     _reportUnboundName(node) {
         if (this._fileInfo.diagnosticRuleSet.reportUnboundVariable === 'none') {
             return;