@zzzen/pyright-internal 1.2.0-dev.20250810 → 1.2.0-dev.20250824

package/dist/analyzer/commentUtils.js

@@ -20,8 +20,10 @@ const standardSetting = 'standard';
 const basicSetting = 'basic';
 function getFileLevelDirectives(tokens, lines, defaultRuleSet, useStrict, diagnostics) {
     let ruleSet = (0, configOptions_1.cloneDiagnosticRuleSet)(defaultRuleSet);
+    let isModified = false;
     if (useStrict) {
         _applyStrictRules(ruleSet);
+        isModified = true;
     }
     for (let i = 0; i < tokens.count; i++) {
         const token = tokens.getItemAt(i);
@@ -36,10 +38,12 @@ function getFileLevelDirectives(tokens, lines, defaultRuleSet, useStrict, diagno
                     return curTokenLineOffset <= 1;
                 };
                 ruleSet = _parsePyrightComment(value, textRange, isCommentOnOwnLine, ruleSet, diagnostics);
+                isModified = true;
             }
         }
     }
-    return ruleSet;
+    // If we didn't make any modifications, use the default rule set to save memory.
+    return isModified ? ruleSet : defaultRuleSet;
 }
 function _applyStrictRules(ruleSet) {
     _overrideRules(ruleSet, (0, configOptions_1.getStrictDiagnosticRuleSet)(), (0, configOptions_1.getStrictModeNotOverriddenRules)());

package/dist/analyzer/commentUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"commentUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/commentUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commentUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/commentUtils.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/importLogger.d.ts

@@ -0,0 +1,5 @@
+export declare class ImportLogger {
+    private _logs;
+    log(message: string): void;
+    getLogs(): string[];
+}

package/dist/analyzer/importLogger.js

@@ -0,0 +1,24 @@
+"use strict";
+/*
+ * importLogging.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ * Author: Eric Traut
+ *
+ * Utilities for logging information about import resolution failures.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportLogger = void 0;
+class ImportLogger {
+    constructor() {
+        this._logs = [];
+    }
+    log(message) {
+        this._logs.push(message);
+    }
+    getLogs() {
+        return this._logs;
+    }
+}
+exports.ImportLogger = ImportLogger;
+//# sourceMappingURL=importLogger.js.map

package/dist/analyzer/importLogger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"importLogger.js","sourceRoot":"","sources":["../../../../../src/analyzer/importLogger.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,MAAa,YAAY;IAAzB;QACY,UAAK,GAAa,EAAE,CAAC;IASjC,CAAC;IAPG,GAAG,CAAC,OAAe;QACf,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;CACJ;AAVD,oCAUC"}

package/dist/analyzer/importResolver.d.ts

@@ -4,6 +4,7 @@ import { Host } from '../common/host';
 import { PythonVersion } from '../common/pythonVersion';
 import { ServiceProvider } from '../common/serviceProvider';
 import { Uri } from '../common/uri/uri';
+import { ImportLogger } from './importLogger';
 import { ImplicitImport, ImportResult, ImportType } from './importResult';
 import { ParentDirectoryCache } from './parentDirectoryCache';
 export interface ImportedModuleDescriptor {
@@ -64,20 +65,20 @@ export declare class ImportResolver {
     isStdlibModule(module: ImportedModuleDescriptor, execEnv: ExecutionEnvironment): boolean;
     getImportRoots(execEnv: ExecutionEnvironment, forLogging?: boolean): Uri[];
     ensurePartialStubPackages(execEnv: ExecutionEnvironment): boolean;
-    getPythonSearchPaths(importFailureInfo: string[]): Uri[];
+    getPythonSearchPaths(importLogger?: ImportLogger): Uri[];
     getTypeshedStdlibExcludeList(customTypeshedPath: Uri | undefined, pythonVersion: PythonVersion, pythonPlatform: string | undefined): Uri[];
-    getTypeshedPathEx(execEnv: ExecutionEnvironment, importFailureInfo: string[]): Uri | undefined;
+    getTypeshedPathEx(execEnv: ExecutionEnvironment, importLogger?: ImportLogger): Uri | undefined;
     protected readdirEntriesCached(uri: Uri): Dirent[];
     protected resolveImportInternal(sourceFileUri: Uri, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor): ImportResult;
     protected fileExistsCached(uri: Uri): boolean;
     protected dirExistsCached(uri: Uri): boolean;
     protected addResultsToCache(sourceFileUri: Uri, execEnv: ExecutionEnvironment, importName: string, importResult: ImportResult, moduleDescriptor: ImportedModuleDescriptor | undefined, fromUserFile: boolean): ImportResult;
-    protected resolveAbsoluteImport(sourceFileUri: Uri | undefined, rootPath: Uri, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor, importName: string, importFailureInfo: string[], allowPartial?: boolean, allowNativeLib?: boolean, useStubPackage?: boolean, allowPyi?: boolean, lookForPyTyped?: boolean): ImportResult;
-    protected resolveImportEx(sourceFileUri: Uri, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor, importName: string, importFailureInfo?: string[], allowPyi?: boolean): ImportResult | undefined;
-    protected resolveNativeImportEx(libraryFileUri: Uri, importName: string, importFailureInfo?: string[]): Uri | undefined;
+    protected resolveAbsoluteImport(sourceFileUri: Uri | undefined, rootPath: Uri, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor, importName: string, importLogger: ImportLogger | undefined, allowPartial?: boolean, allowNativeLib?: boolean, useStubPackage?: boolean, allowPyi?: boolean, lookForPyTyped?: boolean): ImportResult;
+    protected resolveImportEx(sourceFileUri: Uri, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor, importName: string, importLogger?: ImportLogger, allowPyi?: boolean): ImportResult | undefined;
+    protected resolveNativeImportEx(libraryFileUri: Uri, importName: string, importLogger?: ImportLogger): Uri | undefined;
     protected getNativeModuleName(uri: Uri): string | undefined;
     protected filterImplicitImports(importResult: ImportResult, importedSymbols: Set<string> | undefined): ImportResult;
-    protected findImplicitImports(importingModuleName: string, dirPath: Uri, exclusions: Uri[]): Map<string, ImplicitImport>;
+    protected findImplicitImports(importingModuleName: string, dirPath: Uri, exclusions: Uri[]): Map<string, ImplicitImport> | undefined;
     private _resolveImportStrict;
     private _getCompletionSuggestionsStrict;
     private _getModuleNameForImport;