@zzzen/pyright-internal 1.2.0-dev.20231126 → 1.2.0-dev.20231210

package/dist/analyzer/pythonPathUtils.js

@@ -34,23 +34,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPathsFromPthFiles = exports.isPythonBinary = exports.findPythonSearchPaths = exports.getTypeshedSubdirectory = exports.getTypeShedFallbackPath = exports.thirdPartyFolderName = exports.stdLibFolderName = void 0;
 const core_1 = require("../common/core");
 const pathConsts = __importStar(require("../common/pathConsts"));
-const pathUtils_1 = require("../common/pathUtils");
 const pythonVersion_1 = require("../common/pythonVersion");
+const uriUtils_1 = require("../common/uri/uriUtils");
 exports.stdLibFolderName = 'stdlib';
 exports.thirdPartyFolderName = 'stubs';
 function getTypeShedFallbackPath(fs) {
-    let moduleDirectory = fs.getModulePath();
-    if (!moduleDirectory) {
+    const moduleDirectory = fs.getModulePath();
+    if (!moduleDirectory || moduleDirectory.isEmpty()) {
         return undefined;
     }
-    moduleDirectory = (0, pathUtils_1.getDirectoryPath)((0, pathUtils_1.ensureTrailingDirectorySeparator)((0, pathUtils_1.normalizePath)(moduleDirectory)));
-    const typeshedPath = (0, pathUtils_1.combinePaths)(moduleDirectory, pathConsts.typeshedFallback);
+    const typeshedPath = moduleDirectory.combinePaths(pathConsts.typeshedFallback);
     if (fs.existsSync(typeshedPath)) {
         return fs.realCasePath(typeshedPath);
     }
     // In the debug version of Pyright, the code is one level
     // deeper, so we need to look one level up for the typeshed fallback.
-    const debugTypeshedPath = (0, pathUtils_1.combinePaths)((0, pathUtils_1.getDirectoryPath)(moduleDirectory), pathConsts.typeshedFallback);
+    const debugTypeshedPath = moduleDirectory.getDirectory().combinePaths(pathConsts.typeshedFallback);
     if (fs.existsSync(debugTypeshedPath)) {
         return fs.realCasePath(debugTypeshedPath);
     }
@@ -58,18 +57,18 @@ function getTypeShedFallbackPath(fs) {
 }
 exports.getTypeShedFallbackPath = getTypeShedFallbackPath;
 function getTypeshedSubdirectory(typeshedPath, isStdLib) {
-    return (0, pathUtils_1.combinePaths)(typeshedPath, isStdLib ? exports.stdLibFolderName : exports.thirdPartyFolderName);
+    return typeshedPath.combinePaths(isStdLib ? exports.stdLibFolderName : exports.thirdPartyFolderName);
 }
 exports.getTypeshedSubdirectory = getTypeshedSubdirectory;
 function findPythonSearchPaths(fs, configOptions, host, importFailureInfo, includeWatchPathsOnly, workspaceRoot) {
     importFailureInfo.push('Finding python search paths');
     if (configOptions.venvPath !== undefined && configOptions.venv) {
         const venvDir = configOptions.venv;
-        const venvPath = (0, pathUtils_1.combinePaths)(configOptions.venvPath, venvDir);
+        const venvPath = configOptions.venvPath.combinePaths(venvDir);
         const foundPaths = [];
         const sitePackagesPaths = [];
         [pathConsts.lib, pathConsts.lib64, pathConsts.libAlternate].forEach((libPath) => {
-            const sitePackagesPath = findSitePackagesPath(fs, (0, pathUtils_1.combinePaths)(venvPath, libPath), configOptions.defaultPythonVersion, importFailureInfo);
+            const sitePackagesPath = findSitePackagesPath(fs, venvPath.combinePaths(libPath), configOptions.defaultPythonVersion, importFailureInfo);
             if (sitePackagesPath) {
                 addPathIfUnique(foundPaths, sitePackagesPath);
                 sitePackagesPaths.push(fs.realCasePath(sitePackagesPath));
@@ -95,8 +94,7 @@ function findPythonSearchPaths(fs, configOptions, host, importFailureInfo, inclu
     const pathResult = host.getPythonSearchPaths(configOptions.pythonPath, importFailureInfo);
     if (includeWatchPathsOnly && workspaceRoot) {
         const paths = pathResult.paths
-            .filter((p) => !(0, pathUtils_1.containsPath)(workspaceRoot, p, /* ignoreCase */ true) ||
-            (0, pathUtils_1.containsPath)(pathResult.prefix, p, /* ignoreCase */ true))
+            .filter((p) => !p.startsWith(workspaceRoot) || p.startsWith(pathResult.prefix))
             .map((p) => fs.realCasePath(p));
         return paths;
     }
@@ -116,7 +114,7 @@ function findSitePackagesPath(fs, libPath, pythonVersion, importFailureInfo) {
         importFailureInfo.push(`Did not find '${libPath}'`);
         return undefined;
     }
-    const sitePackagesPath = (0, pathUtils_1.combinePaths)(libPath, pathConsts.sitePackages);
+    const sitePackagesPath = libPath.combinePaths(pathConsts.sitePackages);
     if (fs.existsSync(sitePackagesPath)) {
         importFailureInfo.push(`Found path '${sitePackagesPath}'`);
         return sitePackagesPath;
@@ -126,11 +124,11 @@ function findSitePackagesPath(fs, libPath, pythonVersion, importFailureInfo) {
     }
     // We didn't find a site-packages directory directly in the lib
     // directory. Scan for a "python3.X" directory instead.
-    const entries = (0, pathUtils_1.getFileSystemEntries)(fs, libPath);
+    const entries = (0, uriUtils_1.getFileSystemEntries)(fs, libPath);
     // Candidate directories start with "python3.".
     const candidateDirs = entries.directories.filter((dirName) => {
-        if (dirName.startsWith('python3.')) {
-            const dirPath = (0, pathUtils_1.combinePaths)(libPath, dirName, pathConsts.sitePackages);
+        if (dirName.fileName.startsWith('python3.')) {
+            const dirPath = dirName.combinePaths(pathConsts.sitePackages);
             return fs.existsSync(dirPath);
         }
         return false;
@@ -138,9 +136,9 @@ function findSitePackagesPath(fs, libPath, pythonVersion, importFailureInfo) {
     // If there is a python3.X directory (where 3.X matches the configured python
     // version), prefer that over other python directories.
     if (pythonVersion) {
-        const preferredDir = candidateDirs.find((dirName) => dirName === `python${(0, pythonVersion_1.versionToString)(pythonVersion)}`);
+        const preferredDir = candidateDirs.find((dirName) => dirName.fileName === `python${(0, pythonVersion_1.versionToString)(pythonVersion)}`);
         if (preferredDir) {
-            const dirPath = (0, pathUtils_1.combinePaths)(libPath, preferredDir, pathConsts.sitePackages);
+            const dirPath = preferredDir.combinePaths(pathConsts.sitePackages);
             importFailureInfo.push(`Found path '${dirPath}'`);
             return dirPath;
         }
@@ -149,7 +147,7 @@ function findSitePackagesPath(fs, libPath, pythonVersion, importFailureInfo) {
     // first directory that starts with "python". Most of the time, there will be
     // only one.
     if (candidateDirs.length > 0) {
-        const dirPath = (0, pathUtils_1.combinePaths)(libPath, candidateDirs[0], pathConsts.sitePackages);
+        const dirPath = candidateDirs[0].combinePaths(pathConsts.sitePackages);
         importFailureInfo.push(`Found path '${dirPath}'`);
         return dirPath;
     }
@@ -163,8 +161,8 @@ function getPathsFromPthFiles(fs, parentDir) {
         .filter((entry) => (entry.isFile() || entry.isSymbolicLink()) && entry.name.endsWith('.pth'))
         .sort((a, b) => (0, core_1.compareComparableValues)(a.name, b.name));
     pthFiles.forEach((pthFile) => {
-        const filePath = fs.realCasePath((0, pathUtils_1.combinePaths)(parentDir, pthFile.name));
-        const fileStats = (0, pathUtils_1.tryStat)(fs, filePath);
+        const filePath = fs.realCasePath(parentDir.combinePaths(pthFile.name));
+        const fileStats = (0, uriUtils_1.tryStat)(fs, filePath);
         // Skip all files that are much larger than expected.
         if ((fileStats === null || fileStats === void 0 ? void 0 : fileStats.isFile()) && fileStats.size > 0 && fileStats.size < 64 * 1024) {
             const data = fs.readFileSync(filePath, 'utf8');
@@ -172,8 +170,8 @@ function getPathsFromPthFiles(fs, parentDir) {
             lines.forEach((line) => {
                 const trimmedLine = line.trim();
                 if (trimmedLine.length > 0 && !trimmedLine.startsWith('#') && !trimmedLine.match(/^import\s/)) {
-                    const pthPath = (0, pathUtils_1.combinePaths)(parentDir, trimmedLine);
-                    if (fs.existsSync(pthPath) && (0, pathUtils_1.isDirectory)(fs, pthPath)) {
+                    const pthPath = parentDir.combinePaths(trimmedLine);
+                    if (fs.existsSync(pthPath) && (0, uriUtils_1.isDirectory)(fs, pthPath)) {
                         searchPaths.push(fs.realCasePath(pthPath));
                     }
                 }
@@ -184,7 +182,7 @@ function getPathsFromPthFiles(fs, parentDir) {
 }
 exports.getPathsFromPthFiles = getPathsFromPthFiles;
 function addPathIfUnique(pathList, pathToAdd) {
-    if (!pathList.some((path) => path === pathToAdd)) {
+    if (!pathList.some((path) => path.key === pathToAdd.key)) {
         pathList.push(pathToAdd);
         return true;
     }

package/dist/analyzer/pythonPathUtils.js.map

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

package/dist/analyzer/service.d.ts

@@ -11,6 +11,7 @@ import { FileSystem } from '../common/fileSystem';
 import { Host, HostFactory } from '../common/host';
 import { ServiceProvider } from '../common/serviceProvider';
 import { Range } from '../common/textRange';
+import { Uri } from '../common/uri/uri';
 import { AnalysisCompleteCallback } from './analysis';
 import { BackgroundAnalysisProgram, BackgroundAnalysisProgramFactory, InvalidatedReason } from './backgroundAnalysisProgram';
 import { ImportResolver, ImportResolverFactory } from './importResolver';
@@ -39,16 +40,16 @@ export declare class AnalyzerService {
     private readonly _options;
     private readonly _backgroundAnalysisProgram;
     private readonly _serviceProvider;
-    private _executionRootPath;
-    private _typeStubTargetPath;
+    private _executionRootUri;
+    private _typeStubTargetUri;
     private _typeStubTargetIsSingleFile;
     private _sourceFileWatcher;
     private _reloadConfigTimer;
     private _libraryReanalysisTimer;
-    private _configFilePath;
+    private _configFileUri;
     private _configFileWatcher;
     private _libraryFileWatcher;
-    private _librarySearchPathsToWatch;
+    private _librarySearchUrisToWatch;
     private _onCompletionCallback;
     private _commandLineOptions;
     private _analyzeTimer;
@@ -61,7 +62,7 @@ export declare class AnalyzerService {
     get fs(): FileSystem;
     get serviceProvider(): ServiceProvider;
     get cancellationProvider(): CancellationProvider;
-    get librarySearchPathsToWatch(): string[] | undefined;
+    get librarySearchUrisToWatch(): Uri[] | undefined;
     get backgroundAnalysisProgram(): BackgroundAnalysisProgram;
     get test_program(): Program;
     get id(): string;
@@ -71,33 +72,33 @@ export declare class AnalyzerService {
     static createImportResolver(serviceProvider: ServiceProvider, options: ConfigOptions, host: Host): ImportResolver;
     setCompletionCallback(callback: AnalysisCompleteCallback | undefined): void;
     setOptions(commandLineOptions: CommandLineOptions): void;
-    hasSourceFile(filePath: string): boolean;
-    isTracked(filePath: string): boolean;
-    getUserFiles(): string[];
-    getOpenFiles(): string[];
-    setFileOpened(path: string, version: number | null, contents: string, ipythonMode?: IPythonMode, chainedFilePath?: string, realFilePath?: string): void;
-    getChainedFilePath(path: string): string | undefined;
-    updateChainedFilePath(path: string, chainedFilePath: string | undefined): void;
-    updateOpenFileContents(path: string, version: number | null, contents: string, ipythonMode?: IPythonMode, realFilePath?: string): void;
-    setFileClosed(path: string, isTracked?: boolean): void;
-    addInterimFile(path: string): void;
-    getParseResult(path: string): import("../parser/parser").ParseResults | undefined;
-    getSourceFile(path: string): import("./sourceFile").SourceFile | undefined;
-    getTextOnRange(filePath: string, range: Range, token: CancellationToken): string | undefined;
+    hasSourceFile(uri: Uri): boolean;
+    isTracked(uri: Uri): boolean;
+    getUserFiles(): Uri[];
+    getOpenFiles(): Uri[];
+    setFileOpened(uri: Uri, version: number | null, contents: string, ipythonMode?: IPythonMode, chainedFileUri?: Uri): void;
+    getChainedUri(uri: Uri): Uri | undefined;
+    updateChainedUri(uri: Uri, chainedFileUri: Uri | undefined): void;
+    updateOpenFileContents(uri: Uri, version: number | null, contents: string, ipythonMode?: IPythonMode): void;
+    setFileClosed(uri: Uri, isTracked?: boolean): void;
+    addInterimFile(uri: Uri): void;
+    getParseResult(uri: Uri): import("../parser/parser").ParseResults | undefined;
+    getSourceFile(uri: Uri): import("./sourceFile").SourceFile | undefined;
+    getTextOnRange(fileUri: Uri, range: Range, token: CancellationToken): string | undefined;
     getEvaluator(): TypeEvaluator | undefined;
     run<T>(callback: (p: ProgramView) => T, token: CancellationToken): T;
     printStats(): void;
     printDetailedAnalysisTimes(): void;
     printDependencies(verbose: boolean): void;
-    analyzeFile(filePath: string, token: CancellationToken): Promise<boolean>;
-    getDiagnosticsForRange(filePath: string, range: Range, token: CancellationToken): Promise<Diagnostic[]>;
+    analyzeFile(fileUri: Uri, token: CancellationToken): Promise<boolean>;
+    getDiagnosticsForRange(fileUri: Uri, range: Range, token: CancellationToken): Promise<Diagnostic[]>;
     getConfigOptions(): ConfigOptions;
     getImportResolver(): ImportResolver;
     recordUserInteractionTime(): void;
     test_getConfigOptions(commandLineOptions: CommandLineOptions): ConfigOptions;
-    test_getFileNamesFromFileSpecs(): string[];
-    test_shouldHandleSourceFileWatchChanges(path: string, isFile: boolean): boolean;
-    test_shouldHandleLibraryFileWatchChanges(path: string, libSearchPaths: string[]): boolean;
+    test_getFileNamesFromFileSpecs(): Uri[];
+    test_shouldHandleSourceFileWatchChanges(uri: Uri, isFile: boolean): boolean;
+    test_shouldHandleLibraryFileWatchChanges(uri: Uri, libSearchUris: Uri[]): boolean;
     writeTypeStub(token: CancellationToken): void;
     writeTypeStubInBackground(token: CancellationToken): Promise<any>;
     invalidateAndForceReanalysis(reason: InvalidatedReason): void;