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

package/dist/pyrightFileSystem.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PyrightFileSystem = exports.SupportPartialStubs = void 0;
 const pyTypedUtils_1 = require("./analyzer/pyTypedUtils");
 const pathConsts_1 = require("./common/pathConsts");
-const pathUtils_1 = require("./common/pathUtils");
+const uriUtils_1 = require("./common/uri/uriUtils");
 const readonlyAugmentedFileSystem_1 = require("./readonlyAugmentedFileSystem");
 var SupportPartialStubs;
 (function (SupportPartialStubs) {
@@ -33,42 +33,38 @@ class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedF
         // Partial stub package paths processed
         this._partialStubPackagePaths = new Set();
     }
-    mkdirSync(path, options) {
-        this.realFS.mkdirSync(path, options);
+    mkdirSync(uri, options) {
+        this.realFS.mkdirSync(uri, options);
     }
-    chdir(path) {
-        this.realFS.chdir(path);
+    chdir(uri) {
+        this.realFS.chdir(uri);
     }
-    writeFileSync(path, data, encoding) {
-        this.realFS.writeFileSync(this.getOriginalPath(path), data, encoding);
+    writeFileSync(uri, data, encoding) {
+        this.realFS.writeFileSync(this.getOriginalPath(uri), data, encoding);
     }
-    rmdirSync(path) {
-        this.realFS.rmdirSync(this.getOriginalPath(path));
+    rmdirSync(uri) {
+        this.realFS.rmdirSync(this.getOriginalPath(uri));
     }
-    unlinkSync(path) {
-        this.realFS.unlinkSync(this.getOriginalPath(path));
+    unlinkSync(uri) {
+        this.realFS.unlinkSync(this.getOriginalPath(uri));
     }
-    createWriteStream(path) {
-        return this.realFS.createWriteStream(this.getOriginalPath(path));
+    createWriteStream(uri) {
+        return this.realFS.createWriteStream(this.getOriginalPath(uri));
     }
     copyFileSync(src, dst) {
         this.realFS.copyFileSync(this.getOriginalPath(src), this.getOriginalPath(dst));
     }
-    getUri(originalPath) {
-        return this.realFS.getUri(originalPath);
-    }
     isPartialStubPackagesScanned(execEnv) {
-        var _a;
-        return this.isPathScanned((_a = execEnv.root) !== null && _a !== void 0 ? _a : '');
+        return execEnv.root ? this.isPathScanned(execEnv.root) : false;
     }
-    isPathScanned(path) {
-        return this._rootSearched.has(path);
+    isPathScanned(uri) {
+        return this._rootSearched.has(uri.key);
     }
     processPartialStubPackages(paths, roots, bundledStubPath) {
         var _a;
         for (const path of paths) {
-            this._rootSearched.add(path);
-            if (!this.realFS.existsSync(path) || !(0, pathUtils_1.isDirectory)(this.realFS, path)) {
+            this._rootSearched.add(path.key);
+            if (!this.realFS.existsSync(path) || !(0, uriUtils_1.isDirectory)(this.realFS, path)) {
                 continue;
             }
             let dirEntries = [];
@@ -78,12 +74,12 @@ class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedF
             catch {
                 // Leave empty set of dir entries to process.
             }
-            const isBundledStub = path === bundledStubPath;
+            const isBundledStub = path.equals(bundledStubPath);
             for (const entry of dirEntries) {
-                const partialStubPackagePath = (0, pathUtils_1.combinePaths)(path, entry.name);
+                const partialStubPackagePath = path.combinePaths(entry.name);
                 const isDirectory = !entry.isSymbolicLink()
                     ? entry.isDirectory()
-                    : !!((_a = (0, pathUtils_1.tryStat)(this.realFS, partialStubPackagePath)) === null || _a === void 0 ? void 0 : _a.isDirectory());
+                    : !!((_a = (0, uriUtils_1.tryStat)(this.realFS, partialStubPackagePath)) === null || _a === void 0 ? void 0 : _a.isDirectory());
                 if (!isDirectory || !entry.name.endsWith(pathConsts_1.stubsSuffix)) {
                     continue;
                 }
@@ -93,14 +89,14 @@ class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedF
                     continue;
                 }
                 // We found partially typed stub-packages.
-                this._partialStubPackagePaths.add(partialStubPackagePath);
+                this._partialStubPackagePaths.add(partialStubPackagePath.key);
                 // Search the root to see whether we have matching package installed.
                 let partialStubs;
                 const packageName = entry.name.substr(0, entry.name.length - pathConsts_1.stubsSuffix.length);
                 for (const root of roots) {
-                    const packagePath = (0, pathUtils_1.combinePaths)(root, packageName);
+                    const packagePath = root.combinePaths(packageName);
                     try {
-                        const stat = (0, pathUtils_1.tryStat)(this.realFS, packagePath);
+                        const stat = (0, uriUtils_1.tryStat)(this.realFS, packagePath);
                         if (!(stat === null || stat === void 0 ? void 0 : stat.isDirectory())) {
                             continue;
                         }
@@ -116,9 +112,9 @@ class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedF
                         // Merge partial stub packages to the library.
                         partialStubs = partialStubs !== null && partialStubs !== void 0 ? partialStubs : this._getRelativePathPartialStubs(partialStubPackagePath);
                         for (const partialStub of partialStubs) {
-                            const originalPyiFile = (0, pathUtils_1.combinePaths)(partialStubPackagePath, partialStub);
-                            const mappedPyiFile = (0, pathUtils_1.combinePaths)(packagePath, partialStub);
-                            this.recordMovedEntry(mappedPyiFile, originalPyiFile);
+                            const originalPyiFile = partialStubPackagePath.combinePaths(partialStub);
+                            const mappedPyiFile = packagePath.combinePaths(partialStub);
+                            this.recordMovedEntry(mappedPyiFile, originalPyiFile, packagePath);
                         }
                     }
                     catch {
@@ -133,19 +129,18 @@ class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedF
         this._rootSearched.clear();
         this._partialStubPackagePaths.clear();
     }
-    isMovedEntry(path) {
-        return this._partialStubPackagePaths.has(path) || super.isMovedEntry(path);
+    isMovedEntry(uri) {
+        return this._partialStubPackagePaths.has(uri.key) || super.isMovedEntry(uri);
     }
-    _getRelativePathPartialStubs(path) {
-        const paths = [];
-        const partialStubPathLength = (0, pathUtils_1.ensureTrailingDirectorySeparator)(path).length;
-        const searchAllStubs = (path) => {
-            for (const entry of this.realFS.readdirEntriesSync(path)) {
-                const filePath = (0, pathUtils_1.combinePaths)(path, entry.name);
+    _getRelativePathPartialStubs(partialStubPath) {
+        const relativePaths = [];
+        const searchAllStubs = (uri) => {
+            for (const entry of this.realFS.readdirEntriesSync(uri)) {
+                const filePath = uri.combinePaths(entry.name);
                 let isDirectory = entry.isDirectory();
                 let isFile = entry.isFile();
                 if (entry.isSymbolicLink()) {
-                    const stat = (0, pathUtils_1.tryStat)(this.realFS, filePath);
+                    const stat = (0, uriUtils_1.tryStat)(this.realFS, filePath);
                     if (stat) {
                         isDirectory = stat.isDirectory();
                         isFile = stat.isFile();
@@ -155,15 +150,15 @@ class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedF
                     searchAllStubs(filePath);
                 }
                 if (isFile && entry.name.endsWith('.pyi')) {
-                    const relative = filePath.substring(partialStubPathLength);
+                    const relative = partialStubPath.getRelativePathComponents(filePath).join('/');
                     if (relative) {
-                        paths.push(relative);
+                        relativePaths.push(relative);
                     }
                 }
             }
         };
-        searchAllStubs(path);
-        return paths;
+        searchAllStubs(partialStubPath);
+        return relativePaths;
     }
 }
 exports.PyrightFileSystem = PyrightFileSystem;

package/dist/pyrightFileSystem.js.map

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

package/dist/readonlyAugmentedFileSystem.d.ts

@@ -3,39 +3,40 @@
 import type * as fs from 'fs';
 import { FileSystem, MkDirOptions, Stats } from './common/fileSystem';
 import { FileWatcher, FileWatcherEventHandler } from './common/fileWatcher';
+import { Uri } from './common/uri/uri';
 export declare class ReadOnlyAugmentedFileSystem implements FileSystem {
     protected realFS: FileSystem;
     private readonly _entryMap;
     private readonly _reverseEntryMap;
     private readonly _folderMap;
     constructor(realFS: FileSystem);
-    existsSync(path: string): boolean;
-    mkdirSync(path: string, options?: MkDirOptions): void;
-    chdir(path: string): void;
-    readdirEntriesSync(path: string): fs.Dirent[];
-    readdirSync(path: string): string[];
-    readFileSync(path: string, encoding?: null): Buffer;
-    readFileSync(path: string, encoding: BufferEncoding): string;
-    writeFileSync(path: string, data: string | Buffer, encoding: BufferEncoding | null): void;
-    statSync(path: string): Stats;
-    rmdirSync(path: string): void;
-    unlinkSync(path: string): void;
-    realpathSync(path: string): string;
-    getModulePath(): string;
-    createFileSystemWatcher(paths: string[], listener: FileWatcherEventHandler): FileWatcher;
-    createReadStream(path: string): fs.ReadStream;
-    createWriteStream(path: string): fs.WriteStream;
-    copyFileSync(src: string, dst: string): void;
-    readFile(path: string): Promise<Buffer>;
-    readFileText(path: string, encoding?: BufferEncoding): Promise<string>;
-    realCasePath(path: string): string;
-    getUri(originalPath: string): string;
-    isMappedFilePath(filepath: string): boolean;
-    getOriginalFilePath(mappedFilePath: string): string;
-    getMappedFilePath(originalFilepath: string): string;
-    isInZip(path: string): boolean;
-    protected recordMovedEntry(mappedPath: string, originalPath: string, reversible?: boolean, isFile?: boolean): void;
-    protected getOriginalPath(mappedFilePath: string): string;
-    protected isMovedEntry(path: string): boolean;
+    get isCaseSensitive(): boolean;
+    existsSync(uri: Uri): boolean;
+    mkdirSync(uri: Uri, options?: MkDirOptions): void;
+    chdir(uri: Uri): void;
+    readdirEntriesSync(uri: Uri): fs.Dirent[];
+    readdirSync(uri: Uri): string[];
+    readFileSync(uri: Uri, encoding?: null): Buffer;
+    readFileSync(uri: Uri, encoding: BufferEncoding): string;
+    writeFileSync(uri: Uri, data: string | Buffer, encoding: BufferEncoding | null): void;
+    statSync(uri: Uri): Stats;
+    rmdirSync(uri: Uri): void;
+    unlinkSync(uri: Uri): void;
+    realpathSync(uri: Uri): Uri;
+    getModulePath(): Uri;
+    createFileSystemWatcher(paths: Uri[], listener: FileWatcherEventHandler): FileWatcher;
+    createReadStream(uri: Uri): fs.ReadStream;
+    createWriteStream(uri: Uri): fs.WriteStream;
+    copyFileSync(src: Uri, dst: Uri): void;
+    readFile(uri: Uri): Promise<Buffer>;
+    readFileText(uri: Uri, encoding?: BufferEncoding): Promise<string>;
+    realCasePath(uri: Uri): Uri;
+    isMappedUri(fileUri: Uri): boolean;
+    getOriginalUri(mappedFileUri: Uri): Uri;
+    getMappedUri(originalFileUri: Uri): Uri;
+    isInZip(uri: Uri): boolean;
+    protected recordMovedEntry(mappedUri: Uri, originalUri: Uri, rootPath: Uri): void;
+    protected getOriginalPath(mappedFileUri: Uri): Uri;
+    protected isMovedEntry(uri: Uri): boolean;
     protected clear(): void;
 }

package/dist/readonlyAugmentedFileSystem.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReadOnlyAugmentedFileSystem = void 0;
 const collectionUtils_1 = require("./common/collectionUtils");
 const fileSystem_1 = require("./common/fileSystem");
-const pathUtils_1 = require("./common/pathUtils");
 class ReadOnlyAugmentedFileSystem {
     constructor(realFS) {
         this.realFS = realFS;
@@ -22,29 +21,31 @@ class ReadOnlyAugmentedFileSystem {
         // Mapped files per a containing folder map
         this._folderMap = new Map();
     }
-    existsSync(path) {
-        if (this.isMovedEntry(path)) {
+    get isCaseSensitive() {
+        return this.realFS.isCaseSensitive;
+    }
+    existsSync(uri) {
+        if (this.isMovedEntry(uri)) {
             // Pretend partial stub folder and its files not exist
             return false;
         }
-        return this.realFS.existsSync(this.getOriginalPath(path));
+        return this.realFS.existsSync(this.getOriginalPath(uri));
     }
-    mkdirSync(path, options) {
+    mkdirSync(uri, options) {
         throw new Error('Operation is not allowed.');
     }
-    chdir(path) {
+    chdir(uri) {
         throw new Error('Operation is not allowed.');
     }
-    readdirEntriesSync(path) {
-        const maybeDirectory = (0, pathUtils_1.ensureTrailingDirectorySeparator)(path);
+    readdirEntriesSync(uri) {
         const entries = [];
-        const movedEntries = this._folderMap.get(maybeDirectory);
-        if (!movedEntries || this.realFS.existsSync(path)) {
-            (0, collectionUtils_1.appendArray)(entries, this.realFS.readdirEntriesSync(path).filter((item) => {
+        const movedEntries = this._folderMap.get(uri.key);
+        if (!movedEntries || this.realFS.existsSync(uri)) {
+            (0, collectionUtils_1.appendArray)(entries, this.realFS.readdirEntriesSync(uri).filter((item) => {
                 // Filter out the stub package directory and any
                 // entries that will be overwritten by stub package
                 // virtual items.
-                return (!this.isMovedEntry((0, pathUtils_1.combinePaths)(path, item.name)) &&
+                return (!this.isMovedEntry(uri.combinePaths(item.name)) &&
                     !(movedEntries === null || movedEntries === void 0 ? void 0 : movedEntries.some((movedEntry) => movedEntry.name === item.name)));
             }));
         }
@@ -53,29 +54,29 @@ class ReadOnlyAugmentedFileSystem {
         }
         return entries.concat(movedEntries.map((e) => new fileSystem_1.VirtualDirent(e.name, e.isFile)));
     }
-    readdirSync(path) {
-        return this.readdirEntriesSync(path).map((p) => p.name);
+    readdirSync(uri) {
+        return this.readdirEntriesSync(uri).map((p) => p.name);
     }
-    readFileSync(path, encoding) {
-        return this.realFS.readFileSync(this.getOriginalPath(path), encoding);
+    readFileSync(uri, encoding) {
+        return this.realFS.readFileSync(this.getOriginalPath(uri), encoding);
     }
-    writeFileSync(path, data, encoding) {
+    writeFileSync(uri, data, encoding) {
         throw new Error('Operation is not allowed.');
     }
-    statSync(path) {
-        return this.realFS.statSync(this.getOriginalPath(path));
+    statSync(uri) {
+        return this.realFS.statSync(this.getOriginalPath(uri));
     }
-    rmdirSync(path) {
+    rmdirSync(uri) {
         throw new Error('Operation is not allowed.');
     }
-    unlinkSync(path) {
+    unlinkSync(uri) {
         throw new Error('Operation is not allowed.');
     }
-    realpathSync(path) {
-        if (this._entryMap.has(path)) {
-            return path;
+    realpathSync(uri) {
+        if (this._entryMap.has(uri.key)) {
+            return uri;
         }
-        return this.realFS.realpathSync(path);
+        return this.realFS.realpathSync(uri);
     }
     getModulePath() {
         return this.realFS.getModulePath();
@@ -83,63 +84,69 @@ class ReadOnlyAugmentedFileSystem {
     createFileSystemWatcher(paths, listener) {
         return this.realFS.createFileSystemWatcher(paths, listener);
     }
-    createReadStream(path) {
-        return this.realFS.createReadStream(this.getOriginalPath(path));
+    createReadStream(uri) {
+        return this.realFS.createReadStream(this.getOriginalPath(uri));
     }
-    createWriteStream(path) {
+    createWriteStream(uri) {
         throw new Error('Operation is not allowed.');
     }
     copyFileSync(src, dst) {
         throw new Error('Operation is not allowed.');
     }
     // Async I/O
-    readFile(path) {
-        return this.realFS.readFile(this.getOriginalPath(path));
-    }
-    readFileText(path, encoding) {
-        return this.realFS.readFileText(this.getOriginalPath(path), encoding);
+    readFile(uri) {
+        return this.realFS.readFile(this.getOriginalPath(uri));
     }
-    realCasePath(path) {
-        return this.realFS.realCasePath(path);
+    readFileText(uri, encoding) {
+        return this.realFS.readFileText(this.getOriginalPath(uri), encoding);
     }
-    getUri(originalPath) {
-        return this.realFS.getUri(originalPath);
+    realCasePath(uri) {
+        return this.realFS.realCasePath(uri);
     }
     // See whether the file is mapped to another location.
-    isMappedFilePath(filepath) {
-        return this._entryMap.has(filepath) || this.realFS.isMappedFilePath(filepath);
+    isMappedUri(fileUri) {
+        return this._entryMap.has(fileUri.key) || this.realFS.isMappedUri(fileUri);
     }
     // Get original filepath if the given filepath is mapped.
-    getOriginalFilePath(mappedFilePath) {
-        return this.realFS.getOriginalFilePath(this.getOriginalPath(mappedFilePath));
+    getOriginalUri(mappedFileUri) {
+        return this.realFS.getOriginalUri(this.getOriginalPath(mappedFileUri));
     }
     // Get mapped filepath if the given filepath is mapped.
-    getMappedFilePath(originalFilepath) {
+    getMappedUri(originalFileUri) {
         var _a;
-        const mappedFilePath = this.realFS.getMappedFilePath(originalFilepath);
-        return (_a = this._reverseEntryMap.get(mappedFilePath)) !== null && _a !== void 0 ? _a : mappedFilePath;
-    }
-    isInZip(path) {
-        return this.realFS.isInZip(path);
-    }
-    recordMovedEntry(mappedPath, originalPath, reversible = true, isFile = true) {
-        this._entryMap.set(mappedPath, originalPath);
-        if (reversible) {
-            this._reverseEntryMap.set(originalPath, mappedPath);
-        }
-        const directory = (0, pathUtils_1.ensureTrailingDirectorySeparator)((0, pathUtils_1.getDirectoryPath)(mappedPath));
-        const folderInfo = (0, collectionUtils_1.getOrAdd)(this._folderMap, directory, () => []);
-        const name = (0, pathUtils_1.getFileName)(mappedPath);
+        const mappedFileUri = this.realFS.getMappedUri(originalFileUri);
+        return (_a = this._reverseEntryMap.get(mappedFileUri.key)) !== null && _a !== void 0 ? _a : mappedFileUri;
+    }
+    isInZip(uri) {
+        return this.realFS.isInZip(uri);
+    }
+    recordMovedEntry(mappedUri, originalUri, rootPath) {
+        this._entryMap.set(mappedUri.key, originalUri);
+        this._reverseEntryMap.set(originalUri.key, mappedUri);
+        const directory = mappedUri.getDirectory();
+        const folderInfo = (0, collectionUtils_1.getOrAdd)(this._folderMap, directory.key, () => []);
+        const name = mappedUri.fileName;
         if (!folderInfo.some((entry) => entry.name === name)) {
-            folderInfo.push({ name, isFile });
+            folderInfo.push({ name, isFile: true });
+        }
+        // Add the directory entries for the sub paths as well.
+        const subPathEntries = rootPath.getRelativePathComponents(directory);
+        for (let i = 0; i < subPathEntries.length; i++) {
+            const subdir = rootPath.combinePaths(...subPathEntries.slice(0, i + 1));
+            const parent = subdir.getDirectory().key;
+            const dirInfo = (0, collectionUtils_1.getOrAdd)(this._folderMap, parent, () => []);
+            const dirName = subdir.fileName;
+            if (!dirInfo.some((entry) => entry.name === dirName)) {
+                dirInfo.push({ name: dirName, isFile: false });
+            }
         }
     }
-    getOriginalPath(mappedFilePath) {
+    getOriginalPath(mappedFileUri) {
         var _a;
-        return (_a = this._entryMap.get(mappedFilePath)) !== null && _a !== void 0 ? _a : mappedFilePath;
+        return (_a = this._entryMap.get(mappedFileUri.key)) !== null && _a !== void 0 ? _a : mappedFileUri;
     }
-    isMovedEntry(path) {
-        return this._reverseEntryMap.has(path);
+    isMovedEntry(uri) {
+        return this._reverseEntryMap.has(uri.key);
     }
     clear() {
         this._entryMap.clear();

package/dist/readonlyAugmentedFileSystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"readonlyAugmentedFileSystem.js","sourceRoot":"","sources":["../../src/readonlyAugmentedFileSystem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"readonlyAugmentedFileSystem.js","sourceRoot":"","sources":["../../src/readonlyAugmentedFileSystem.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAIH,8DAAiE;AACjE,oDAAqF;AAIrF,MAAa,2BAA2B;IAUpC,YAAsB,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;QATxC,mCAAmC;QAClB,cAAS,GAAG,IAAI,GAAG,EAAe,CAAC;QAEpD,mCAAmC;QAClB,qBAAgB,GAAG,IAAI,GAAG,EAAe,CAAC;QAE3D,2CAA2C;QAC1B,eAAU,GAAG,IAAI,GAAG,EAA+C,CAAC;IAE1C,CAAC;IAE5C,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;IACvC,CAAC;IAED,UAAU,CAAC,GAAQ;QACf,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;YACxB,sDAAsD;YACtD,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,SAAS,CAAC,GAAQ,EAAE,OAAsB;QACtC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,GAAQ;QACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,kBAAkB,CAAC,GAAQ;QACvB,MAAM,OAAO,GAAgB,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9C,IAAA,6BAAW,EACP,OAAO,EACP,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChD,gDAAgD;gBAChD,mDAAmD;gBACnD,iBAAiB;gBACjB,OAAO,CACH,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC/C,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAA,CACrE,CAAC;YACN,CAAC,CAAC,CACL,CAAC;SACL;QAED,IAAI,CAAC,YAAY,EAAE;YACf,OAAO,OAAO,CAAC;SAClB;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,0BAAa,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,WAAW,CAAC,GAAQ;QAChB,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAID,YAAY,CAAC,GAAQ,EAAE,QAAgC;QACnD,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;IACzE,CAAC;IAED,aAAa,CAAC,GAAQ,EAAE,IAAqB,EAAE,QAA+B;QAC1E,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,QAAQ,CAAC,GAAQ;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,SAAS,CAAC,GAAQ;QACd,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,UAAU,CAAC,GAAQ;QACf,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,YAAY,CAAC,GAAQ;QACjB,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC7B,OAAO,GAAG,CAAC;SACd;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IACvC,CAAC;IAED,uBAAuB,CAAC,KAAY,EAAE,QAAiC;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,GAAQ;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,iBAAiB,CAAC,GAAQ;QACtB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,YAAY,CAAC,GAAQ,EAAE,GAAQ;QAC3B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,YAAY;IACZ,QAAQ,CAAC,GAAQ;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,YAAY,CAAC,GAAQ,EAAE,QAAyB;QAC5C,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;IACzE,CAAC;IAED,YAAY,CAAC,GAAQ;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,sDAAsD;IACtD,WAAW,CAAC,OAAY;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED,yDAAyD;IACzD,cAAc,CAAC,aAAkB;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,uDAAuD;IACvD,YAAY,CAAC,eAAoB;;QAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QAChE,OAAO,MAAA,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,mCAAI,aAAa,CAAC;IACzE,CAAC;IAED,OAAO,CAAC,GAAQ;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAES,gBAAgB,CAAC,SAAc,EAAE,WAAgB,EAAE,QAAa;QACtE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAEtD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAA,0BAAQ,EAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtE,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE;YAClD,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3C;QAED,uDAAuD;QACvD,MAAM,cAAc,GAAG,QAAQ,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5C,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACxE,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC;YACzC,MAAM,OAAO,GAAG,IAAA,0BAAQ,EAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE;gBAClD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;aAClD;SACJ;IACL,CAAC;IAES,eAAe,CAAC,aAAkB;;QACxC,OAAO,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,mCAAI,aAAa,CAAC;IAClE,CAAC;IAES,YAAY,CAAC,GAAQ;QAC3B,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAES,KAAK;QACX,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACJ;AAvLD,kEAuLC"}

package/dist/server.js

@@ -19,9 +19,10 @@ const core_1 = require("./common/core");
 const envVarUtils_1 = require("./common/envVarUtils");
 const fileBasedCancellationUtils_1 = require("./common/fileBasedCancellationUtils");
 const fullAccessHost_1 = require("./common/fullAccessHost");
-const pathUtils_1 = require("./common/pathUtils");
 const realFileSystem_1 = require("./common/realFileSystem");
 const serviceProviderExtensions_1 = require("./common/serviceProviderExtensions");
+const uri_1 = require("./common/uri/uri");
+const uriUtils_1 = require("./common/uri/uriUtils");
 const languageServerBase_1 = require("./languageServerBase");
 const codeActionProvider_1 = require("./languageService/codeActionProvider");
 const pyrightFileSystem_1 = require("./pyrightFileSystem");
@@ -30,18 +31,18 @@ class PyrightServer extends languageServerBase_1.LanguageServerBase {
     constructor(connection) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const version = require('../package.json').version || '';
-        // When executed from CLI command (pyright-langserver), __rootDirectory is
-        // already defined. When executed from VSCode extension, rootDirectory should
-        // be __dirname.
-        const rootDirectory = global.__rootDirectory || __dirname;
         const console = new console_1.ConsoleWithLogLevel(connection.console);
         const fileWatcherProvider = new realFileSystem_1.WorkspaceFileWatcherProvider();
         const fileSystem = (0, realFileSystem_1.createFromRealFileSystem)(console, fileWatcherProvider);
         const pyrightFs = new pyrightFileSystem_1.PyrightFileSystem(fileSystem);
-        const tempFile = new realFileSystem_1.RealTempFile();
+        const tempFile = new realFileSystem_1.RealTempFile(pyrightFs.isCaseSensitive);
         const cacheManager = new cacheManager_1.CacheManager();
         const serviceProvider = (0, serviceProviderExtensions_1.createServiceProvider)(pyrightFs, tempFile, console, cacheManager);
-        const realPathRoot = (0, pathUtils_1.realCasePath)(rootDirectory, pyrightFs);
+        // When executed from CLI command (pyright-langserver), __rootDirectory is
+        // already defined. When executed from VSCode extension, rootDirectory should
+        // be __dirname.
+        const rootDirectory = (0, uriUtils_1.getRootUri)(pyrightFs.isCaseSensitive) || uri_1.Uri.file(__dirname, pyrightFs.isCaseSensitive);
+        const realPathRoot = pyrightFs.realCasePath(rootDirectory);
         super({
             productName: 'Pyright',
             rootDirectory: realPathRoot,
@@ -63,36 +64,36 @@ class PyrightServer extends languageServerBase_1.LanguageServerBase {
             useLibraryCodeForTypes: true,
             disableLanguageServices: false,
             disableOrganizeImports: false,
-            typeCheckingMode: 'basic',
+            typeCheckingMode: 'standard',
             diagnosticSeverityOverrides: {},
             logLevel: console_1.LogLevel.Info,
             autoImportCompletions: true,
             functionSignatureDisplay: configOptions_1.SignatureDisplayType.formatted,
         };
         try {
-            const pythonSection = await this.getConfiguration(workspace.uri, 'python');
+            const pythonSection = await this.getConfiguration(workspace.rootUri, 'python');
             if (pythonSection) {
                 const pythonPath = pythonSection.pythonPath;
                 if (pythonPath && (0, core_1.isString)(pythonPath) && !(0, pythonPathUtils_1.isPythonBinary)(pythonPath)) {
-                    serverSettings.pythonPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, (0, envVarUtils_1.expandPathVariables)(workspace.rootPath, pythonPath));
+                    serverSettings.pythonPath = workspace.rootUri.combinePaths((0, envVarUtils_1.expandPathVariables)(workspace.rootUri, pythonPath));
                 }
                 const venvPath = pythonSection.venvPath;
                 if (venvPath && (0, core_1.isString)(venvPath)) {
-                    serverSettings.venvPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, (0, envVarUtils_1.expandPathVariables)(workspace.rootPath, venvPath));
+                    serverSettings.venvPath = workspace.rootUri.combinePaths((0, envVarUtils_1.expandPathVariables)(workspace.rootUri, venvPath));
                 }
             }
-            const pythonAnalysisSection = await this.getConfiguration(workspace.uri, 'python.analysis');
+            const pythonAnalysisSection = await this.getConfiguration(workspace.rootUri, 'python.analysis');
             if (pythonAnalysisSection) {
                 const typeshedPaths = pythonAnalysisSection.typeshedPaths;
                 if (typeshedPaths && Array.isArray(typeshedPaths) && typeshedPaths.length > 0) {
                     const typeshedPath = typeshedPaths[0];
                     if (typeshedPath && (0, core_1.isString)(typeshedPath)) {
-                        serverSettings.typeshedPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, (0, envVarUtils_1.expandPathVariables)(workspace.rootPath, typeshedPath));
+                        serverSettings.typeshedPath = workspace.rootUri.combinePaths((0, envVarUtils_1.expandPathVariables)(workspace.rootUri, typeshedPath));
                     }
                 }
                 const stubPath = pythonAnalysisSection.stubPath;
                 if (stubPath && (0, core_1.isString)(stubPath)) {
-                    serverSettings.stubPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, (0, envVarUtils_1.expandPathVariables)(workspace.rootPath, stubPath));
+                    serverSettings.stubPath = workspace.rootUri.combinePaths((0, envVarUtils_1.expandPathVariables)(workspace.rootUri, stubPath));
                 }
                 const diagnosticSeverityOverrides = pythonAnalysisSection.diagnosticSeverityOverrides;
                 if (diagnosticSeverityOverrides) {
@@ -119,7 +120,7 @@ class PyrightServer extends languageServerBase_1.LanguageServerBase {
                 if (extraPaths && Array.isArray(extraPaths) && extraPaths.length > 0) {
                     serverSettings.extraPaths = extraPaths
                         .filter((p) => p && (0, core_1.isString)(p))
-                        .map((p) => (0, pathUtils_1.resolvePaths)(workspace.rootPath, (0, envVarUtils_1.expandPathVariables)(workspace.rootPath, p)));
+                        .map((p) => workspace.rootUri.combinePaths((0, envVarUtils_1.expandPathVariables)(workspace.rootUri, p)));
                 }
                 serverSettings.includeFileSpecs = this._getStringValues(pythonAnalysisSection.include);
                 serverSettings.excludeFileSpecs = this._getStringValues(pythonAnalysisSection.exclude);
@@ -141,7 +142,7 @@ class PyrightServer extends languageServerBase_1.LanguageServerBase {
             else {
                 serverSettings.autoSearchPaths = true;
             }
-            const pyrightSection = await this.getConfiguration(workspace.uri, 'pyright');
+            const pyrightSection = await this.getConfiguration(workspace.rootUri, 'pyright');
             if (pyrightSection) {
                 if (pyrightSection.openFilesOnly !== undefined) {
                     serverSettings.openFilesOnly = !!pyrightSection.openFilesOnly;
@@ -168,10 +169,10 @@ class PyrightServer extends languageServerBase_1.LanguageServerBase {
             // is used where cancellation is not supported.
             return undefined;
         }
-        return new backgroundAnalysis_1.BackgroundAnalysis(this.console);
+        return new backgroundAnalysis_1.BackgroundAnalysis(this.serverOptions.serviceProvider);
     }
     createHost() {
-        return new fullAccessHost_1.FullAccessHost(this.fs);
+        return new fullAccessHost_1.FullAccessHost(this.serverOptions.serviceProvider);
     }
     createImportResolver(serviceProvider, options, host) {
         const importResolver = new importResolver_1.ImportResolver(serviceProvider, options, host);
@@ -188,9 +189,9 @@ class PyrightServer extends languageServerBase_1.LanguageServerBase {
     }
     async executeCodeAction(params, token) {
         this.recordUserInteractionTime();
-        const filePath = this.uriParser.decodeTextDocumentUri(params.textDocument.uri);
-        const workspace = await this.getWorkspaceForFile(filePath);
-        return codeActionProvider_1.CodeActionProvider.getCodeActionsForPosition(workspace, filePath, params.range, params.context.only, token);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.serverOptions.serviceProvider.fs().isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
+        return codeActionProvider_1.CodeActionProvider.getCodeActionsForPosition(workspace, uri, params.range, params.context.only, token);
     }
     createProgressReporter() {
         // The old progress notifications are kept for backwards compatibility with