@zzzen/pyright-internal 1.2.0-dev.20250316 → 1.2.0-dev.20250330

package/dist/analyzer/checker.js

@@ -92,6 +92,8 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         this._scopedNodes = [];
         // A list of all visited type parameter lists.
         this._typeParamLists = [];
+        // A list of all visited multipart import statements.
+        this._multipartImports = [];
         this._moduleNode = parseResults.parseTree;
         this._fileInfo = AnalyzerNodeInfo.getFileInfo(this._moduleNode);
     }
@@ -116,6 +118,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // Perform a one-time validation of symbols in all scopes
         // defined in this module for things like unaccessed variables.
         this._validateSymbolTables();
+        this._reportUnusedMultipartImports();
         this._reportDuplicateImports();
     }
     walk(node) {
@@ -940,7 +943,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         const typeResult = this._evaluator.getTypeResult(node.d.member);
         const type = typeResult?.type ?? types_1.UnknownType.create();
         const leftExprType = this._evaluator.getType(node.d.leftExpr);
-        this._reportDeprecatedUseForType(node.d.member, type, leftExprType && (0, types_1.isModule)(leftExprType) && leftExprType.priv.moduleName === 'typing');
+        const moduleName = leftExprType && (0, types_1.isModule)(leftExprType) ? leftExprType.priv.moduleName : undefined;
+        const isImportedFromTyping = moduleName === 'typing' || moduleName === 'typing_extensions';
+        this._reportDeprecatedUseForType(node.d.member, type, isImportedFromTyping);
         if (typeResult?.memberAccessDeprecationInfo) {
             this._reportDeprecatedUseForMemberAccess(node.d.member, typeResult.memberAccessDeprecationInfo);
         }
@@ -952,6 +957,10 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     visitImportAs(node) {
         this._conditionallyReportShadowedImport(node);
         this._evaluator.evaluateTypesForStatement(node);
+        const nameParts = node.d.module.d.nameParts;
+        if (nameParts.length > 1 && !node.d.alias) {
+            this._multipartImports.push(node);
+        }
         return true;
     }
     visitImportFrom(node) {
@@ -1009,7 +1018,8 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         let isImportFromTyping = false;
         if (node.parent?.nodeType === 25 /* ParseNodeType.ImportFrom */) {
             if (node.parent.d.module.d.leadingDots === 0 && node.parent.d.module.d.nameParts.length === 1) {
-                if (node.parent.d.module.d.nameParts[0].d.value === 'typing') {
+                const namePart = node.parent.d.module.d.nameParts[0].d.value;
+                if (namePart === 'typing' || namePart === 'typing_extensions') {
                     isImportFromTyping = true;
                 }
             }
@@ -1104,6 +1114,50 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // Don't explore further.
         return false;
     }
+    _reportUnusedMultipartImports() {
+        this._multipartImports.forEach((node) => {
+            const nameParts = node.d.module.d.nameParts;
+            if (this._isMultipartImportUnused(node)) {
+                const multipartName = nameParts.map((np) => np.d.value).join('.');
+                let textRange = { start: nameParts[0].start, length: nameParts[0].length };
+                textRange = textRange_1.TextRange.extend(textRange, nameParts[nameParts.length - 1]);
+                this._fileInfo.diagnosticSink.addUnusedCodeWithTextRange(localize_1.LocMessage.unaccessedSymbol().format({ name: multipartName }), textRange, { action: "pyright.unusedImport" /* Commands.unusedImport */ });
+                this._evaluator.addDiagnosticForTextRange(this._fileInfo, diagnosticRules_1.DiagnosticRule.reportUnusedImport, localize_1.LocMessage.unaccessedImport().format({ name: multipartName }), textRange);
+            }
+        });
+    }
+    _isMultipartImportUnused(node) {
+        const nameParts = node.d.module.d.nameParts;
+        (0, debug_1.assert)(nameParts.length > 1);
+        // Get the top-level module type associated with this import.
+        let moduleType = this._evaluator.evaluateTypeForSubnode(node, () => {
+            this._evaluator.evaluateTypesForStatement(node);
+        })?.type;
+        if (!moduleType || !(0, types_1.isModule)(moduleType)) {
+            return false;
+        }
+        // Walk the module hierarchy to get the submodules in the
+        // multi-name import path until we get to the second-to-the-last
+        // part.
+        for (let i = 1; i < nameParts.length - 1; i++) {
+            const symbol = types_1.ModuleType.getField(moduleType, nameParts[i].d.value);
+            if (!symbol) {
+                return false;
+            }
+            const submoduleType = symbol.getSynthesizedType();
+            if (!submoduleType || !(0, types_1.isModule)(submoduleType.type)) {
+                return false;
+            }
+            moduleType = submoduleType.type;
+        }
+        // Look up the last part of the import to get its symbol ID.
+        const lastPartName = nameParts[nameParts.length - 1].d.value;
+        const symbol = types_1.ModuleType.getField(moduleType, lastPartName);
+        if (!symbol) {
+            return false;
+        }
+        return !this._fileInfo.accessedSymbolSet.has(symbol.id);
+    }
     _getImportResult(node, uri) {
         const execEnv = this._importResolver.getConfigOptions().findExecEnvironment(uri);
         const moduleNameNode = node.parent.d.module;
@@ -1330,6 +1384,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     // have overlapping types.
     _validateComparisonTypes(node) {
         let rightExpression = node.d.rightExpr;
+        const assumeIsOperator = node.d.operator === 39 /* OperatorType.Is */ || node.d.operator === 40 /* OperatorType.IsNot */;
         // Check for chained comparisons.
         if (rightExpression.nodeType === 7 /* ParseNodeType.BinaryOperation */ &&
             !rightExpression.d.hasParens &&
@@ -1382,7 +1437,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     if (isComparable) {
                         return;
                     }
-                    if (this._evaluator.isTypeComparable(leftSubtype, rightSubtype)) {
+                    if (this._evaluator.isTypeComparable(leftSubtype, rightSubtype, assumeIsOperator)) {
                         isComparable = true;
                     }
                     return rightSubtype;
@@ -2481,15 +2536,12 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         }
                     }
                     else {
-                        // Handle multi-part names specially.
                         const nameParts = decl.node.d.module.d.nameParts;
-                        if (nameParts.length > 0) {
-                            const multipartName = nameParts.map((np) => np.d.value).join('.');
-                            let textRange = { start: nameParts[0].start, length: nameParts[0].length };
-                            textRange = textRange_1.TextRange.extend(textRange, nameParts[nameParts.length - 1]);
-                            this._fileInfo.diagnosticSink.addUnusedCodeWithTextRange(localize_1.LocMessage.unaccessedSymbol().format({ name: multipartName }), textRange, { action: "pyright.unusedImport" /* Commands.unusedImport */ });
-                            this._evaluator.addDiagnosticForTextRange(this._fileInfo, diagnosticRules_1.DiagnosticRule.reportUnusedImport, localize_1.LocMessage.unaccessedImport().format({ name: multipartName }), textRange);
-                            return;
+                        // Multi-part imports are handled separately, so ignore those here.
+                        if (nameParts.length === 1) {
+                            nameNode = nameParts[0];
+                            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnusedImport, localize_1.LocMessage.unaccessedImport().format({ name: nameNode.d.value }), nameNode);
+                            message = localize_1.LocMessage.unaccessedImport().format({ name: nameNode.d.value });
                         }
                     }
                 }
@@ -3329,9 +3381,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     // If the function consists entirely of "...", assume that it's
                     // an abstract method or a protocol method and don't require that
                     // the return type matches. This check can also be skipped for an overload.
-                    if (!ParseTreeUtils.isSuiteEmpty(node.d.suite) &&
-                        !types_1.FunctionType.isOverloaded(functionType) &&
-                        !types_1.FunctionType.isAsync(functionType)) {
+                    if (!ParseTreeUtils.isSuiteEmpty(node.d.suite) && !types_1.FunctionType.isOverloaded(functionType)) {
                         this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportReturnType, localize_1.LocMessage.noReturnReturnsNone(), returnAnnotation);
                     }
                 }
@@ -4556,8 +4606,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             return;
         }
         const baseClass = baseClassAndSymbol.classType;
+        const baseClassSelf = types_1.ClassType.cloneAsInstance((0, typeUtils_1.selfSpecializeClass)(baseClass, { useBoundTypeVars: true }));
         const childClassSelf = types_1.ClassType.cloneAsInstance((0, typeUtils_1.selfSpecializeClass)(childClassType, { useBoundTypeVars: true }));
-        let baseType = (0, typeUtils_1.partiallySpecializeType)(this._evaluator.getEffectiveTypeOfSymbol(baseClassAndSymbol.symbol), baseClass, this._evaluator.getTypeClassType(), childClassSelf);
+        let baseType = (0, typeUtils_1.partiallySpecializeType)(this._evaluator.getEffectiveTypeOfSymbol(baseClassAndSymbol.symbol), baseClass, this._evaluator.getTypeClassType(), baseClassSelf);
         overrideType = (0, typeUtils_1.partiallySpecializeType)(overrideType, childClassType, this._evaluator.getTypeClassType(), childClassSelf);
         if (childClassType.shared.typeVarScopeId) {
             overrideType = (0, typeUtils_1.makeTypeVarsBound)(overrideType, [childClassType.shared.typeVarScopeId]);