@zzzen/pyright-internal 1.2.0-dev.20230326 → 1.2.0-dev.20230409

package/dist/analyzer/checker.js

@@ -1,4 +1,17 @@
 "use strict";
+/*
+ * checker.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ * Author: Eric Traut
+ *
+ * A parse tree walker that performs static type checking for
+ * a source file. Most of its work is performed by the type
+ * evaluator, but this module touches every node in the file
+ * to ensure that all statements and expressions are evaluated
+ * and checked. It also performs some additional checks that
+ * cannot (or should not be) performed lazily.
+ */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
@@ -20,19 +33,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Checker = void 0;
-/*
- * checker.ts
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT license.
- * Author: Eric Traut
- *
- * A parse tree walker that performs static type checking for
- * a source file. Most of its work is performed by the type
- * evaluator, but this module touches every node in the file
- * to ensure that all statements and expressions are evaluated
- * and checked. It also performs some additional checks that
- * cannot (or should not be) performed lazily.
- */
 const vscode_languageserver_1 = require("vscode-languageserver");
 const debug_1 = require("../common/debug");
 const diagnostic_1 = require("../common/diagnostic");
@@ -48,6 +48,7 @@ const AnalyzerNodeInfo = __importStar(require("./analyzerNodeInfo"));
 const declaration_1 = require("./declaration");
 const importResolver_1 = require("./importResolver");
 const importStatementUtils_1 = require("./importStatementUtils");
+const parameterUtils_1 = require("./parameterUtils");
 const ParseTreeUtils = __importStar(require("./parseTreeUtils"));
 const parseTreeWalker_1 = require("./parseTreeWalker");
 const patternMatching_1 = require("./patternMatching");
@@ -3170,7 +3171,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             !postInitType.details.declaration) {
             return;
         }
-        const paramListDetails = (0, typeUtils_1.getParameterListDetails)(postInitType);
+        const paramListDetails = (0, parameterUtils_1.getParameterListDetails)(postInitType);
         // If there is an *args or **kwargs parameter or a keyword-only separator,
         // don't bother checking.
         if (paramListDetails.argsIndex !== undefined ||
@@ -3736,6 +3737,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         });
     }
     _validateOverrideDecoratorPresent(overrideType, baseMember) {
+        var _a;
         // Skip this check if disabled.
         if (this._fileInfo.diagnosticRuleSet.reportImplicitOverride === 'none') {
             return;
@@ -3747,9 +3749,22 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         else if ((0, types_1.isOverloadedFunction)(overrideType)) {
             overrideFunction = types_1.OverloadedFunctionType.getImplementation(overrideType);
         }
+        else if ((0, types_1.isClassInstance)(overrideType) && types_1.ClassType.isPropertyClass(overrideType)) {
+            const fgetSymbol = overrideType.details.fields.get('fget');
+            if (fgetSymbol) {
+                const fgetType = (_a = this._evaluator.getDeclaredTypeOfSymbol(fgetSymbol)) === null || _a === void 0 ? void 0 : _a.type;
+                if (fgetType && (0, types_1.isFunction)(fgetType)) {
+                    overrideFunction = fgetType;
+                }
+            }
+        }
         if (!(overrideFunction === null || overrideFunction === void 0 ? void 0 : overrideFunction.details.declaration) || types_1.FunctionType.isOverridden(overrideFunction)) {
             return;
         }
+        // Constructors are exempt.
+        if (overrideFunction.details.name === '__init__' || overrideFunction.details.name === '__new__') {
+            return;
+        }
         const funcNode = overrideFunction.details.declaration.node;
         this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportImplicitOverride, diagnosticRules_1.DiagnosticRule.reportImplicitOverride, localize_1.Localizer.Diagnostic.overrideDecoratorMissing().format({
             name: funcNode.name.value,
@@ -3760,6 +3775,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     // decorator. In this case, an error is reported because no base class has declared
     // a method of the same name.
     _validateOverrideDecoratorNotPresent(overrideType) {
+        var _a;
         let overrideFunction;
         if ((0, types_1.isFunction)(overrideType)) {
             overrideFunction = overrideType;
@@ -3767,6 +3783,15 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         else if ((0, types_1.isOverloadedFunction)(overrideType)) {
             overrideFunction = types_1.OverloadedFunctionType.getImplementation(overrideType);
         }
+        else if ((0, types_1.isClassInstance)(overrideType) && types_1.ClassType.isPropertyClass(overrideType)) {
+            const fgetSymbol = overrideType.details.fields.get('fget');
+            if (fgetSymbol) {
+                const fgetType = (_a = this._evaluator.getDeclaredTypeOfSymbol(fgetSymbol)) === null || _a === void 0 ? void 0 : _a.type;
+                if (fgetType && (0, types_1.isFunction)(fgetType)) {
+                    overrideFunction = fgetType;
+                }
+            }
+        }
         if (!(overrideFunction === null || overrideFunction === void 0 ? void 0 : overrideFunction.details.declaration) || !types_1.FunctionType.isOverridden(overrideFunction)) {
             return;
         }
@@ -4187,10 +4212,19 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             return;
         }
         // Don't enforce this for an overloaded method because the "self" param
-        // annotation can be used as a filter for the overload.
+        // annotation can be used as a filter for the overload. This differs from
+        // mypy, which enforces this check for overloads, but there are legitimate
+        // uses for this in an overloaded method.
         if (types_1.FunctionType.isOverloaded(functionType)) {
             return;
         }
+        // If the declared type is LiteralString and the class is str, exempt this case.
+        // It's used in the typeshed stubs.
+        if ((0, types_1.isClassInstance)(paramType) &&
+            types_1.ClassType.isBuiltIn(paramType, 'LiteralString') &&
+            types_1.ClassType.isBuiltIn(classType, 'str')) {
+            return;
+        }
         const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(functionType));
         if (!this._evaluator.assignType(paramType, expectedType, /* diag */ undefined, typeVarContext)) {
             // We exempt Never from this check because it has a legitimate use in this case.
@@ -4359,11 +4393,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         });
     }
     _addDiagnosticForRegionComment(regionComment, message) {
-        // extend range to include # character
-        const range = regionComment.comment;
-        range.start -= 1;
-        range.length += 1;
-        return this._evaluator.addDiagnosticForTextRange(this._fileInfo, 'error', '', message, range);
+        return this._evaluator.addDiagnosticForTextRange(this._fileInfo, 'error', '', message, {
+            // extend range to include # character
+            start: regionComment.comment.start - 1,
+            length: regionComment.comment.length + 1,
+        });
     }
 }
 exports.Checker = Checker;