@zzzen/pyright-internal 1.2.0-dev.20250907 → 1.2.0-dev.20250914

package/dist/analyzer/checker.d.ts

@@ -2,12 +2,10 @@ import { AssertNode, AssignmentExpressionNode, AssignmentNode, AugmentedAssignme
 import { ParserOutput } from '../parser/parser';
 import { ImportResolver } from './importResolver';
 import { ParseTreeWalker } from './parseTreeWalker';
-import { SourceMapper } from './sourceMapper';
 import { TypeEvaluator } from './typeEvaluatorTypes';
 export declare class Checker extends ParseTreeWalker {
     private _importResolver;
     private _evaluator;
-    private _sourceMapper;
     private _dependentFiles?;
     private readonly _moduleNode;
     private readonly _fileInfo;
@@ -15,7 +13,7 @@ export declare class Checker extends ParseTreeWalker {
     private _scopedNodes;
     private _typeParamLists;
     private _multipartImports;
-    constructor(_importResolver: ImportResolver, _evaluator: TypeEvaluator, parseResults: ParserOutput, _sourceMapper: SourceMapper, _dependentFiles?: ParserOutput[] | undefined);
+    constructor(_importResolver: ImportResolver, _evaluator: TypeEvaluator, parseResults: ParserOutput, _dependentFiles?: ParserOutput[] | undefined);
     check(): void;
     walk(node: ParseNode): void;
     visitSuite(node: SuiteNode): boolean;
@@ -118,8 +116,6 @@ export declare class Checker extends ParseTreeWalker {
     private _reportDeprecatedUseForType;
     private _reportDeprecatedDiagnostic;
     private _reportUnboundName;
-    private _conditionallyReportShadowedModule;
-    private _conditionallyReportShadowedImport;
     private _conditionallyReportPrivateUsage;
     private _validateEnumClassOverride;
     private _validateTypedDictClassSuite;

package/dist/analyzer/checker.js

@@ -37,7 +37,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Checker = void 0;
-const vscode_languageserver_1 = require("vscode-languageserver");
 const collectionUtils_1 = require("../common/collectionUtils");
 const debug_1 = require("../common/debug");
 const diagnostic_1 = require("../common/diagnostic");
@@ -45,7 +44,6 @@ const diagnosticRules_1 = require("../common/diagnosticRules");
 const pythonVersion_1 = require("../common/pythonVersion");
 const textRange_1 = require("../common/textRange");
 const uri_1 = require("../common/uri/uri");
-const definitionProvider_1 = require("../languageService/definitionProvider");
 const localize_1 = require("../localization/localize");
 const parseNodes_1 = require("../parser/parseNodes");
 const stringTokenUtils_1 = require("../parser/stringTokenUtils");
@@ -80,11 +78,10 @@ const typeUtils_1 = require("./typeUtils");
 // functions to be emitted.
 const isPrintCodeComplexityEnabled = false;
 class Checker extends parseTreeWalker_1.ParseTreeWalker {
-    constructor(_importResolver, _evaluator, parseResults, _sourceMapper, _dependentFiles) {
+    constructor(_importResolver, _evaluator, parseResults, _dependentFiles) {
         super();
         this._importResolver = _importResolver;
         this._evaluator = _evaluator;
-        this._sourceMapper = _sourceMapper;
         this._dependentFiles = _dependentFiles;
         this._isUnboundCheckSuppressed = false;
         // A list of all nodes that are defined within the module that
@@ -99,7 +96,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     }
     check() {
         this._scopedNodes.push(this._moduleNode);
-        this._conditionallyReportShadowedModule();
         // Report code complexity issues for the module.
         const codeComplexity = AnalyzerNodeInfo.getCodeFlowComplexity(this._moduleNode);
         if (isPrintCodeComplexityEnabled) {
@@ -955,7 +951,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitImportAs(node) {
-        this._conditionallyReportShadowedImport(node);
         this._evaluator.evaluateTypesForStatement(node);
         const nameParts = node.d.module.d.nameParts;
         if (nameParts.length > 1 && !node.d.alias) {
@@ -972,7 +967,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.futureImportLocationNotAllowed(), node);
             }
         }
-        this._conditionallyReportShadowedImport(node);
         if (!node.d.isWildcardImport) {
             node.d.imports.forEach((importAs) => {
                 this._evaluator.evaluateTypesForStatement(importAs);
@@ -3119,89 +3113,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
     }
-    _conditionallyReportShadowedModule() {
-        if (this._fileInfo.diagnosticRuleSet.reportShadowedImports === 'none') {
-            return;
-        }
-        // Check the module we're in.
-        const moduleName = this._fileInfo.moduleName;
-        const desc = {
-            nameParts: moduleName.split('.'),
-            leadingDots: 0,
-            importedSymbols: new Set(),
-        };
-        const stdlibPath = this._importResolver.getTypeshedStdLibPath(this._fileInfo.executionEnvironment);
-        if (stdlibPath &&
-            this._importResolver.isStdlibModule(desc, this._fileInfo.executionEnvironment) &&
-            this._sourceMapper.isUserCode(this._fileInfo.fileUri)) {
-            // This means the user has a module that is overwriting the stdlib module.
-            const diag = this._evaluator.addDiagnosticForTextRange(this._fileInfo, diagnosticRules_1.DiagnosticRule.reportShadowedImports, localize_1.LocMessage.stdlibModuleOverridden().format({
-                name: moduleName,
-                path: this._fileInfo.fileUri.toUserVisibleString(),
-            }), this._moduleNode);
-            // Add a quick action that renames the file.
-            if (diag) {
-                const renameAction = {
-                    action: "renameShadowedFile" /* ActionKind.RenameShadowedFileAction */,
-                    oldUri: this._fileInfo.fileUri,
-                    newUri: this._sourceMapper.getNextFileName(this._fileInfo.fileUri),
-                };
-                diag.addAction(renameAction);
-            }
-        }
-    }
-    _conditionallyReportShadowedImport(node) {
-        if (this._fileInfo.diagnosticRuleSet.reportShadowedImports === 'none') {
-            return;
-        }
-        // Skip this check for relative imports.
-        const nodeModule = node.nodeType === 26 /* ParseNodeType.ImportFromAs */
-            ? node.parent?.nodeType === 25 /* ParseNodeType.ImportFrom */
-                ? node.parent?.d.module
-                : undefined
-            : node.d.module;
-        if (nodeModule?.d.leadingDots) {
-            return;
-        }
-        // Otherwise use the name to determine if a match for a stdlib module.
-        const namePartNodes = node.nodeType === 24 /* ParseNodeType.ImportAs */
-            ? node.d.module.d.nameParts
-            : node.nodeType === 26 /* ParseNodeType.ImportFromAs */
-                ? [node.d.name]
-                : node.d.module.d.nameParts;
-        const nameParts = namePartNodes.map((n) => n.d.value);
-        const module = {
-            nameParts,
-            leadingDots: 0,
-            importedSymbols: new Set(),
-        };
-        // Make sure the module is a potential stdlib one so we don't spend the time
-        // searching for the definition.
-        const stdlibPath = this._importResolver.getTypeshedStdLibPath(this._fileInfo.executionEnvironment);
-        if (stdlibPath && this._importResolver.isStdlibModule(module, this._fileInfo.executionEnvironment)) {
-            // If the definition for this name is in 'user' module, it is overwriting the stdlib module.
-            const definitions = definitionProvider_1.DefinitionProvider.getDefinitionsForNode(this._sourceMapper, this._evaluator, namePartNodes[namePartNodes.length - 1], namePartNodes[namePartNodes.length - 1].start, vscode_languageserver_1.CancellationToken.None);
-            const paths = definitions ? definitions.map((d) => d.uri) : [];
-            paths.forEach((p) => {
-                if (!p.startsWith(stdlibPath) && !(0, sourceMapper_1.isStubFile)(p) && this._sourceMapper.isUserCode(p)) {
-                    // This means the user has a module that is overwriting the stdlib module.
-                    const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportShadowedImports, localize_1.LocMessage.stdlibModuleOverridden().format({
-                        name: nameParts.join('.'),
-                        path: p.toUserVisibleString(),
-                    }), node);
-                    // Add a quick action that renames the file.
-                    if (diag) {
-                        const renameAction = {
-                            action: "renameShadowedFile" /* ActionKind.RenameShadowedFileAction */,
-                            oldUri: p,
-                            newUri: this._sourceMapper.getNextFileName(p),
-                        };
-                        diag.addAction(renameAction);
-                    }
-                }
-            });
-        }
-    }
     _conditionallyReportPrivateUsage(node) {
         if (this._fileInfo.diagnosticRuleSet.reportPrivateUsage === 'none') {
             return;