@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231217

package/dist/tests/harness/vfs/filesystem.d.ts

@@ -3,17 +3,18 @@
 import { Dirent, ReadStream, WriteStream } from 'fs';
 import { FileSystem, MkDirOptions, TempFile, TmpfileOptions } from '../../../common/fileSystem';
 import { FileWatcher, FileWatcherEventHandler, FileWatcherEventType } from '../../../common/fileWatcher';
+import { Uri } from '../../../common/uri/uri';
 import { Metadata } from './../utils';
 export declare const MODULE_PATH: string;
 export interface DiffOptions {
     includeChangedFileWithSameContent?: boolean;
 }
 export declare class TestFileSystemWatcher implements FileWatcher {
-    private _listener;
     private _paths;
-    constructor(paths: string[], _listener: FileWatcherEventHandler);
+    private _listener;
+    constructor(_paths: Uri[], _listener: FileWatcherEventHandler);
     close(): void;
-    fireFileChange(path: string, eventType: FileWatcherEventType): boolean;
+    fireFileChange(path: Uri, eventType: FileWatcherEventType): boolean;
 }
 /**
  * Represents a virtual POSIX-like file system.
@@ -33,6 +34,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
     private _id;
     private static _nextId;
     constructor(ignoreCase: boolean, options?: FileSystemOptions);
+    get isCaseSensitive(): boolean;
     /**
      * Gets metadata for this `FileSystem`.
      */
@@ -83,7 +85,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * @link http://pubs.opengroup.org/onlinepubs/9699919799/functions/chdir.html
      */
-    chdir(path: string): void;
+    chdir(uri: Uri): void;
     /**
      * Pushes the current directory onto the directory stack and changes the current working directory to the supplied path.
      */
@@ -110,16 +112,15 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      * @param traversal The traversal scheme to use.
      */
     lscanSync(path: string, axis: Axis, traversal: Traversal): string[];
-    createFileSystemWatcher(paths: string[], listener: FileWatcherEventHandler): FileWatcher;
+    createFileSystemWatcher(paths: Uri[], listener: FileWatcherEventHandler): FileWatcher;
     fireFileWatcherEvent(path: string, event: FileWatcherEventType): void;
-    getModulePath(): string;
-    tmpdir(): string;
-    tmpfile(options?: TmpfileOptions): string;
-    realCasePath(path: string): string;
-    isMappedFilePath(filepath: string): boolean;
-    getOriginalFilePath(mappedFilePath: string): string;
-    getMappedFilePath(originalFilepath: string): string;
-    getUri(path: string): string;
+    getModulePath(): Uri;
+    tmpdir(): Uri;
+    tmpfile(options?: TmpfileOptions): Uri;
+    realCasePath(path: Uri): Uri;
+    isMappedUri(filepath: Uri): boolean;
+    getOriginalUri(mappedFilePath: Uri): Uri;
+    getMappedUri(originalFilepath: Uri): Uri;
     /**
      * Mounts a physical or virtual file system at a location in this virtual file system.
      *
@@ -144,7 +145,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
     /**
      * Determines whether a path exists.
      */
-    existsSync(path: string): boolean;
+    existsSync(path: Uri): boolean;
     /**
      * Get file status. If `path` is a symbolic link, it is dereferenced.
      *
@@ -152,7 +153,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    statSync(path: string): Stats;
+    statSync(path: Uri): Stats;
     /**
      * Change file access times
      *
@@ -174,7 +175,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    readdirSync(path: string): string[];
+    readdirSync(path: Uri): string[];
     /**
      * Read a directory. If `path` is a symbolic link, it is dereferenced.
      *
@@ -182,7 +183,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    readdirEntriesSync(path: string): Dirent[];
+    readdirEntriesSync(path: Uri): Dirent[];
     /**
      * Make a directory.
      *
@@ -190,7 +191,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    mkdirSync(path: string, options?: MkDirOptions): void;
+    mkdirSync(path: Uri, options?: MkDirOptions): void;
     /**
      * Remove a directory.
      *
@@ -198,7 +199,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    rmdirSync(path: string): void;
+    rmdirSync(uri: Uri): void;
     /**
      * Link one file to another file (also known as a "hard link").
      *
@@ -214,7 +215,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    unlinkSync(path: string): void;
+    unlinkSync(path: Uri): void;
     /**
      * Rename a file.
      *
@@ -238,36 +239,36 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    realpathSync(path: string): string;
+    realpathSync(path: Uri): Uri;
     /**
      * Read from a file.
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    readFileSync(path: string, encoding?: null): Buffer;
+    readFileSync(path: Uri, encoding?: null): Buffer;
     /**
      * Read from a file.
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    readFileSync(path: string, encoding: BufferEncoding): string;
+    readFileSync(path: Uri, encoding: BufferEncoding): string;
     /**
      * Read from a file.
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    readFileSync(path: string, encoding?: BufferEncoding | null): string | Buffer;
+    readFileSync(path: Uri, encoding?: BufferEncoding | null): string | Buffer;
     /**
      * Write to a file.
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    writeFileSync(path: string, data: string | Buffer, encoding?: BufferEncoding | null): void;
-    readFile(filePath: string): Promise<Buffer>;
-    readFileText(filePath: string, encoding?: BufferEncoding): Promise<string>;
-    createReadStream(path: string): ReadStream;
-    createWriteStream(path: string): WriteStream;
-    copyFileSync(src: string, dst: string): void;
+    writeFileSync(uri: Uri, data: string | Buffer, encoding?: BufferEncoding | null): void;
+    readFile(fileUri: Uri): Promise<Buffer>;
+    readFileText(fileUri: Uri, encoding?: BufferEncoding): Promise<string>;
+    createReadStream(path: Uri): ReadStream;
+    createWriteStream(path: Uri): WriteStream;
+    copyFileSync(src: Uri, dst: Uri): void;
     /**
      * Generates a `FileSet` patch containing all the entries in this `FileSystem` that are not in `base`.
      * @param base The base file system. If not provided, this file system's `shadowRoot` is used (if present).
@@ -277,7 +278,7 @@ export declare class TestFileSystem implements FileSystem, TempFile {
      * Generates a `FileSet` patch containing all the entries in `changed` that are not in `base`.
      */
     static diff(changed: TestFileSystem, base: TestFileSystem, options?: DiffOptions): FileSet | undefined;
-    isInZip(path: string): boolean;
+    isInZip(path: Uri): boolean;
     dispose(): void;
     private _mkdir;
     private _filemeta;

package/dist/tests/harness/vfs/filesystem.js

@@ -31,28 +31,26 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatPatch = exports.Mount = exports.S_IFIFO = exports.S_IFCHR = exports.S_IFDIR = exports.S_IFBLK = exports.S_IFREG = exports.S_IFLNK = exports.S_IFSOCK = exports.S_IFMT = exports.Symlink = exports.Unlink = exports.Rmdir = exports.Link = exports.SameFileContentFile = exports.File = exports.Directory = exports.TestFileSystem = exports.TestFileSystemWatcher = exports.MODULE_PATH = void 0;
-const vscode_uri_1 = require("vscode-uri");
 const pathUtil = __importStar(require("../../../common/pathUtils"));
+const stringUtils_1 = require("../../../common/stringUtils");
+const uri_1 = require("../../../common/uri/uri");
 const utils_1 = require("../utils");
 const utils_2 = require("./../utils");
 const pathValidation_1 = require("./pathValidation");
-const stringUtils_1 = require("../../../common/stringUtils");
 exports.MODULE_PATH = pathUtil.normalizeSlashes('/');
 let devCount = 0; // A monotonically increasing count of device ids
 let inoCount = 0; // A monotonically increasing count of inodes
 class TestFileSystemWatcher {
-    constructor(paths, _listener) {
+    constructor(_paths, _listener) {
+        this._paths = _paths;
         this._listener = _listener;
-        this._paths = [];
-        this._paths = paths.map((p) => pathUtil.normalizePath(p));
     }
     close() {
         // Do nothing.
     }
     fireFileChange(path, eventType) {
-        const normalized = pathUtil.normalizePath(path);
-        if (this._paths.some((p) => normalized.startsWith(p))) {
-            this._listener(eventType, normalized);
+        if (this._paths.some((p) => path.startsWith(p))) {
+            this._listener(eventType, path.getFilePath());
             return true;
         }
         return false;
@@ -82,7 +80,7 @@ class TestFileSystem {
             this._applyFiles(files, /* dirname */ '');
         }
         let cwd = options.cwd;
-        if ((!cwd || (!pathUtil.isDiskPathRoot(cwd) && !pathUtil.isUri(cwd))) && this._lazy.links) {
+        if ((!cwd || !pathUtil.isDiskPathRoot(cwd)) && this._lazy.links) {
             const iterator = (0, utils_2.getIterator)(this._lazy.links.keys());
             try {
                 for (let i = (0, utils_2.nextResult)(iterator); i; i = (0, utils_2.nextResult)(iterator)) {
@@ -101,6 +99,9 @@ class TestFileSystem {
         }
         this._cwd = cwd || '';
     }
+    get isCaseSensitive() {
+        return !this.ignoreCase;
+    }
     /**
      * Gets metadata for this `FileSystem`.
      */
@@ -223,7 +224,8 @@ class TestFileSystem {
      *
      * @link http://pubs.opengroup.org/onlinepubs/9699919799/functions/chdir.html
      */
-    chdir(path) {
+    chdir(uri) {
+        let path = uri.getFilePath();
         if (this.isReadonly) {
             throw (0, utils_1.createIOError)('EPERM');
         }
@@ -254,7 +256,7 @@ class TestFileSystem {
             this._dirStack.push(this._cwd);
         }
         if (path && path !== this._cwd) {
-            this.chdir(path);
+            this.chdir(uri_1.Uri.file(path));
         }
     }
     /**
@@ -266,7 +268,7 @@ class TestFileSystem {
         }
         const path = this._dirStack && this._dirStack.pop();
         if (path) {
-            this.chdir(path);
+            this.chdir(uri_1.Uri.file(path));
         }
     }
     /**
@@ -307,48 +309,41 @@ class TestFileSystem {
     }
     fireFileWatcherEvent(path, event) {
         for (const watcher of this._watchers) {
-            if (watcher.fireFileChange(path, event)) {
+            if (watcher.fireFileChange(uri_1.Uri.file(path), event)) {
                 break;
             }
         }
     }
     getModulePath() {
-        return exports.MODULE_PATH;
+        return uri_1.Uri.file(exports.MODULE_PATH);
     }
     tmpdir() {
         this.mkdirpSync('/tmp');
-        return pathUtil.normalizeSlashes('/tmp');
+        return uri_1.Uri.parse('file:///tmp', true);
     }
     tmpfile(options) {
         // Use an algorithm similar to tmp's.
         const prefix = (options === null || options === void 0 ? void 0 : options.prefix) || 'tmp';
         const postfix = (options === null || options === void 0 ? void 0 : options.prefix) ? '-' + options.prefix : '';
         const name = `${prefix}-${this._tmpfileCounter++}${postfix}`;
-        const path = pathUtil.combinePaths(this.tmpdir(), name);
+        const path = this.tmpdir().combinePaths(name);
         this.writeFileSync(path, '');
         return path;
     }
     realCasePath(path) {
         return path;
     }
-    isMappedFilePath(filepath) {
+    isMappedUri(filepath) {
         return false;
     }
     // Get original filepath if the given filepath is mapped.
-    getOriginalFilePath(mappedFilePath) {
+    getOriginalUri(mappedFilePath) {
         return mappedFilePath;
     }
     // Get mapped filepath if the given filepath is mapped.
-    getMappedFilePath(originalFilepath) {
+    getMappedUri(originalFilepath) {
         return originalFilepath;
     }
-    getUri(path) {
-        // If this is not a file path, just return the original path.
-        if (pathUtil.isUri(path)) {
-            return path;
-        }
-        return vscode_uri_1.URI.file(path).toString();
-    }
     /**
      * Mounts a physical or virtual file system at a location in this virtual file system.
      *
@@ -378,13 +373,13 @@ class TestFileSystem {
         try {
             const stats = this.lstatSync(path);
             if (stats.isFile() || stats.isSymbolicLink()) {
-                this.unlinkSync(path);
+                this.unlinkSync(uri_1.Uri.file(path));
             }
             else if (stats.isDirectory()) {
-                for (const file of this.readdirSync(path)) {
+                for (const file of this.readdirSync(uri_1.Uri.file(path))) {
                     this.rimrafSync(pathUtil.combinePaths(path, file));
                 }
-                this.rmdirSync(path);
+                this.rmdirSync(uri_1.Uri.file(path));
             }
         }
         catch (e) {
@@ -458,7 +453,10 @@ class TestFileSystem {
      * Determines whether a path exists.
      */
     existsSync(path) {
-        const result = this._walk(this._resolve(path), /* noFollow */ true, () => 'stop');
+        if (path.isEmpty()) {
+            return false;
+        }
+        const result = this._walk(this._resolve(path.getFilePath()), /* noFollow */ true, () => 'stop');
         return result !== undefined && result.node !== undefined;
     }
     /**
@@ -469,7 +467,7 @@ class TestFileSystem {
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
     statSync(path) {
-        return this._stat(this._walk(this._resolve(path)));
+        return this._stat(this._walk(this._resolve(path.getFilePath())));
     }
     /**
      * Change file access times
@@ -509,7 +507,7 @@ class TestFileSystem {
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
     readdirSync(path) {
-        const { node } = this._walk(this._resolve(path));
+        const { node } = this._walk(this._resolve(path.getFilePath()));
         if (!node) {
             throw (0, utils_1.createIOError)('ENOENT');
         }
@@ -526,7 +524,7 @@ class TestFileSystem {
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
     readdirEntriesSync(path) {
-        const { node } = this._walk(this._resolve(path));
+        const { node } = this._walk(this._resolve(path.getFilePath()));
         if (!node) {
             throw (0, utils_1.createIOError)('ENOENT');
         }
@@ -548,10 +546,10 @@ class TestFileSystem {
             throw (0, utils_1.createIOError)('EROFS');
         }
         if (options === null || options === void 0 ? void 0 : options.recursive) {
-            this.mkdirpSync(path);
+            this.mkdirpSync(path.getFilePath());
             return;
         }
-        this._mkdir(this._walk(this._resolve(path), /* noFollow */ true));
+        this._mkdir(this._walk(this._resolve(path.getFilePath()), /* noFollow */ true));
     }
     /**
      * Remove a directory.
@@ -560,11 +558,11 @@ class TestFileSystem {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    rmdirSync(path) {
+    rmdirSync(uri) {
         if (this.isReadonly) {
             throw (0, utils_1.createIOError)('EROFS');
         }
-        path = this._resolve(path);
+        const path = this._resolve(uri.getFilePath());
         const { parent, links, node, basename } = this._walk(path, /* noFollow */ true);
         if (!parent) {
             throw (0, utils_1.createIOError)('EPERM');
@@ -615,7 +613,7 @@ class TestFileSystem {
         if (this.isReadonly) {
             throw (0, utils_1.createIOError)('EROFS');
         }
-        const { parent, links, node, basename } = this._walk(this._resolve(path), /* noFollow */ true);
+        const { parent, links, node, basename } = this._walk(this._resolve(path.getFilePath()), /* noFollow */ true);
         if (!parent) {
             throw (0, utils_1.createIOError)('EPERM');
         }
@@ -700,15 +698,15 @@ class TestFileSystem {
      */
     realpathSync(path) {
         try {
-            const { realpath } = this._walk(this._resolve(path));
-            return realpath;
+            const { realpath } = this._walk(this._resolve(path.getFilePath()));
+            return uri_1.Uri.file(realpath);
         }
         catch (e) {
             return path;
         }
     }
     readFileSync(path, encoding = null) {
-        const { node } = this._walk(this._resolve(path));
+        const { node } = this._walk(this._resolve(path.getFilePath()));
         if (!node) {
             throw (0, utils_1.createIOError)('ENOENT');
         }
@@ -726,11 +724,11 @@ class TestFileSystem {
      *
      * NOTE: do not rename this method as it is intended to align with the same named export of the "fs" module.
      */
-    writeFileSync(path, data, encoding = null) {
+    writeFileSync(uri, data, encoding = null) {
         if (this.isReadonly) {
             throw (0, utils_1.createIOError)('EROFS');
         }
-        const { parent, links, node: existingNode, basename } = this._walk(this._resolve(path), /* noFollow */ false);
+        const { parent, links, node: existingNode, basename, } = this._walk(this._resolve(uri.getFilePath()), /* noFollow */ false);
         if (!parent) {
             throw (0, utils_1.createIOError)('EPERM');
         }
@@ -753,11 +751,11 @@ class TestFileSystem {
         node.mtimeMs = time;
         node.ctimeMs = time;
     }
-    readFile(filePath) {
-        return Promise.resolve(this.readFileSync(filePath));
+    readFile(fileUri) {
+        return Promise.resolve(this.readFileSync(fileUri));
     }
-    readFileText(filePath, encoding) {
-        return Promise.resolve(this.readFileSync(filePath, encoding || 'utf8'));
+    readFileText(fileUri, encoding) {
+        return Promise.resolve(this.readFileSync(fileUri, encoding || 'utf8'));
     }
     createReadStream(path) {
         throw new Error('Not implemented in test file system.');
@@ -829,7 +827,7 @@ class TestFileSystem {
         }
         if (axis === 'descendants-or-self' || axis === 'descendants') {
             if (stats.isDirectory() && (!traversal.traverse || traversal.traverse(path, stats))) {
-                for (const file of this.readdirSync(path)) {
+                for (const file of this.readdirSync(uri_1.Uri.file(path))) {
                     try {
                         const childpath = pathUtil.combinePaths(path, file);
                         const stats = this._stat(this._walk(childpath, noFollow));
@@ -1300,7 +1298,7 @@ class TestFileSystem {
                     throw new TypeError('Roots cannot be files.');
                 }
                 this.mkdirpSync(pathUtil.getDirectoryPath(path));
-                this.writeFileSync(path, value.data, value.encoding);
+                this.writeFileSync(uri_1.Uri.file(path), value.data, value.encoding);
                 this._applyFileExtendedOptions(path, value);
             }
             else if (value instanceof Directory) {