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

package/dist/common/envVarUtils.js

@@ -32,40 +32,32 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandPathVariables = void 0;
 const os = __importStar(require("os"));
-const pathUtils_1 = require("./pathUtils");
 // Expands certain predefined variables supported within VS Code settings.
 // Ideally, VS Code would provide an API for doing this expansion, but
 // it doesn't. We'll handle the most common variables here as a convenience.
 function expandPathVariables(rootPath, path) {
-    const pathParts = (0, pathUtils_1.getPathComponents)(path);
-    const expandedParts = [];
-    for (const part of pathParts) {
-        const trimmedPart = part.trim();
-        if (trimmedPart === '${workspaceFolder}') {
-            expandedParts.push(rootPath);
-        }
-        else if (trimmedPart === '${env:HOME}' && process.env.HOME !== undefined) {
-            expandedParts.push(process.env.HOME);
-        }
-        else if (trimmedPart === '${env:USERNAME}' && process.env.USERNAME !== undefined) {
-            expandedParts.push(process.env.USERNAME);
-        }
-        else if (trimmedPart === '${env:VIRTUAL_ENV}' && process.env.VIRTUAL_ENV !== undefined) {
-            expandedParts.push(process.env.VIRTUAL_ENV);
-        }
-        else if (trimmedPart === '~' && os.homedir) {
-            expandedParts.push(os.homedir() || process.env.HOME || process.env.USERPROFILE || '~');
-        }
-        else {
-            expandedParts.push(part);
-        }
+    // Make sure the pathStr looks like a URI path.
+    let pathStr = path.replace(/\\/g, '/');
+    // Make sure all replacements look like URI paths too.
+    const replace = (match, replaceValue) => {
+        pathStr = pathStr.replace(match, replaceValue.replace(/\\/g, '/'));
+    };
+    // Replace everything inline.
+    pathStr = pathStr.replace(/\$\{workspaceFolder\}/g, rootPath.getPath());
+    if (process.env.HOME !== undefined) {
+        replace(/\$\{env:HOME\}/g, process.env.HOME || '');
     }
-    if (expandedParts.length === 0) {
-        return path;
+    if (process.env.USERNAME !== undefined) {
+        replace(/\$\{env:USERNAME\}/g, process.env.USERNAME || '');
     }
-    const root = expandedParts.shift();
-    const expandedPath = (0, pathUtils_1.combinePaths)(root, ...expandedParts);
-    return (0, pathUtils_1.hasTrailingDirectorySeparator)(path) ? (0, pathUtils_1.ensureTrailingDirectorySeparator)(expandedPath) : expandedPath;
+    if (process.env.VIRTUAL_ENV !== undefined) {
+        replace(/\$\{env:VIRTUAL_ENV\}/g, process.env.VIRTUAL_ENV || '');
+    }
+    if (os.homedir) {
+        replace(/\/~/g, os.homedir() || process.env.HOME || process.env.USERPROFILE || '~');
+        replace(/^~/g, os.homedir() || process.env.HOME || process.env.USERPROFILE || '~');
+    }
+    return pathStr;
 }
 exports.expandPathVariables = expandPathVariables;
 //# sourceMappingURL=envVarUtils.js.map

package/dist/common/envVarUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"envVarUtils.js","sourceRoot":"","sources":["../../../src/common/envVarUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AAEzB,2CAKqB;AAErB,0EAA0E;AAC1E,sEAAsE;AACtE,4EAA4E;AAC5E,SAAgB,mBAAmB,CAAC,QAAgB,EAAE,IAAY;IAC9D,MAAM,SAAS,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAE1C,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,WAAW,KAAK,oBAAoB,EAAE;YACtC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC;aAAM,IAAI,WAAW,KAAK,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;YACxE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACxC;aAAM,IAAI,WAAW,KAAK,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChF,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC5C;aAAM,IAAI,WAAW,KAAK,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE;YACtF,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;SAC/C;aAAM,IAAI,WAAW,KAAK,GAAG,IAAI,EAAE,CAAC,OAAO,EAAE;YAC1C,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,CAAC;SAC1F;aAAM;YACH,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5B;KACJ;IAED,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC;KACf;IAED,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,EAAG,CAAC;IACpC,MAAM,YAAY,GAAG,IAAA,wBAAY,EAAC,IAAI,EAAE,GAAG,aAAa,CAAC,CAAC;IAC1D,OAAO,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,4CAAgC,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC/G,CAAC;AA7BD,kDA6BC"}
+{"version":3,"file":"envVarUtils.js","sourceRoot":"","sources":["../../../src/common/envVarUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AAIzB,0EAA0E;AAC1E,sEAAsE;AACtE,4EAA4E;AAC5E,SAAgB,mBAAmB,CAAC,QAAa,EAAE,IAAY;IAC3D,+CAA+C;IAC/C,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEvC,sDAAsD;IACtD,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,YAAoB,EAAE,EAAE;QACpD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC;IAEF,6BAA6B;IAC7B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACxE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;QAChC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;KACtD;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE;QACpC,OAAO,CAAC,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;KAC9D;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE;QACvC,OAAO,CAAC,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;KACpE;IACD,IAAI,EAAE,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,CAAC;QACpF,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,CAAC;KACtF;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AA1BD,kDA0BC"}

package/dist/common/extensibility.d.ts

@@ -2,26 +2,26 @@ import { CancellationToken } from 'vscode-languageserver';
 import { Declaration } from '../analyzer/declaration';
 import { ImportResolver } from '../analyzer/importResolver';
 import * as prog from '../analyzer/program';
+import { IPythonMode } from '../analyzer/sourceFile';
 import { SourceMapper } from '../analyzer/sourceMapper';
+import { SymbolTable } from '../analyzer/symbol';
 import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
+import { Diagnostic } from '../common/diagnostic';
 import { ServerSettings } from '../languageServerBase';
 import { ParseNode } from '../parser/parseNodes';
 import { ParseResults } from '../parser/parser';
 import { ConfigOptions } from './configOptions';
 import { ConsoleInterface } from './console';
 import { ReadOnlyFileSystem } from './fileSystem';
-import { Range } from './textRange';
-import { SymbolTable } from '../analyzer/symbol';
-import { Diagnostic } from '../common/diagnostic';
-import { IPythonMode } from '../analyzer/sourceFile';
 import { GroupServiceKey, ServiceKey } from './serviceProvider';
+import { Range } from './textRange';
+import { Uri } from './uri/uri';
 export interface SourceFile {
     isStubFile(): boolean;
     isThirdPartyPyTypedPresent(): boolean;
     getIPythonMode(): IPythonMode;
-    getFilePath(): string;
+    getUri(): Uri;
     getFileContent(): string | undefined;
-    getRealFilePath(): string | undefined;
     getClientVersion(): number | undefined;
     getOpenFileContents(): string | undefined;
     getModuleSymbolTable(): SymbolTable | undefined;
@@ -47,32 +47,32 @@ export interface ServiceProvider {
 }
 export interface ProgramView {
     readonly id: string;
-    readonly rootPath: string;
+    readonly rootPath: Uri;
     readonly console: ConsoleInterface;
     readonly evaluator: TypeEvaluator | undefined;
     readonly configOptions: ConfigOptions;
     readonly importResolver: ImportResolver;
     readonly fileSystem: ReadOnlyFileSystem;
     readonly serviceProvider: ServiceProvider;
-    owns(file: string): boolean;
+    owns(uri: Uri): boolean;
     getSourceFileInfoList(): readonly SourceFileInfo[];
-    getParseResults(filePath: string): ParseResults | undefined;
-    getSourceFileInfo(filePath: string): SourceFileInfo | undefined;
-    getChainedFilePath(filePath: string): string | undefined;
-    getSourceMapper(filePath: string, token: CancellationToken, mapCompiled?: boolean, preferStubs?: boolean): SourceMapper;
-    analyzeFile(filePath: string, token: CancellationToken): boolean;
-    getDiagnosticsForRange(filePath: string, range: Range): Diagnostic[];
+    getParseResults(fileUri: Uri): ParseResults | undefined;
+    getSourceFileInfo(fileUri: Uri): SourceFileInfo | undefined;
+    getChainedUri(fileUri: Uri): Uri | undefined;
+    getSourceMapper(fileUri: Uri, token: CancellationToken, mapCompiled?: boolean, preferStubs?: boolean): SourceMapper;
+    analyzeFile(fileUri: Uri, token: CancellationToken): boolean;
+    getDiagnosticsForRange(fileUri: Uri, range: Range): Diagnostic[];
     handleMemoryHighUsage(): void;
     clone(): prog.Program;
 }
 export interface EditableProgram extends ProgramView {
-    addInterimFile(file: string): void;
-    setFileOpened(filePath: string, version: number | null, contents: string, options?: prog.OpenFileOptions): void;
-    updateChainedFilePath(filePath: string, chainedFilePath: string | undefined): void;
+    addInterimFile(uri: Uri): void;
+    setFileOpened(fileUri: Uri, version: number | null, contents: string, options?: prog.OpenFileOptions): void;
+    updateChainedUri(fileUri: Uri, chainedUri: Uri | undefined): void;
 }
 export interface ProgramMutator {
     addInterimFile(file: string): void;
-    setFileOpened(filePath: string, version: number | null, contents: string, ipythonMode: IPythonMode, chainedFilePath?: string, realFilePath?: string): void;
+    setFileOpened(fileUri: Uri, version: number | null, contents: string, ipythonMode: IPythonMode, chainedFilePath?: string, realFilePath?: string): void;
     updateOpenFileContents(path: string, version: number | null, contents: string, ipythonMode: IPythonMode, realFilePath?: string): void;
 }
 export declare enum ReferenceUseCase {
@@ -97,7 +97,7 @@ export interface SymbolUsageProvider {
     appendDeclarationsAt(context: ParseNode, from: readonly Declaration[], to: Declaration[]): void;
 }
 export interface StatusMutationListener {
-    fileDirty?: (filePath: string) => void;
+    fileDirty?: (fileUri: Uri) => void;
     clearCache?: () => void;
     updateSettings?: <T extends ServerSettings>(settings: T) => void;
 }

package/dist/common/extensibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"extensibility.js","sourceRoot":"","sources":["../../../src/common/extensibility.ts"],"names":[],"mappings":";AAAA;;;;;;EAME;;;AAgIF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,2DAAM,CAAA;IACN,mEAAU,CAAA;AACd,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B"}
+{"version":3,"file":"extensibility.js","sourceRoot":"","sources":["../../../src/common/extensibility.ts"],"names":[],"mappings":";AAAA;;;;;;EAME;;;AA2HF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,2DAAM,CAAA;IACN,mEAAU,CAAA;AACd,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B"}

package/dist/common/fileSystem.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="node" />
 import type * as fs from 'fs';
 import { FileWatcher, FileWatcherEventHandler } from './fileWatcher';
+import { Uri } from './uri/uri';
 export interface Stats {
     size: number;
     mtimeMs: number;
@@ -18,42 +19,42 @@ export interface MkDirOptions {
     recursive: boolean;
 }
 export interface ReadOnlyFileSystem {
-    existsSync(path: string): boolean;
-    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;
-    readFileSync(path: string, encoding?: BufferEncoding | null): string | Buffer;
-    statSync(path: string): Stats;
-    realpathSync(path: string): string;
-    getModulePath(): string;
-    readFile(path: string): Promise<Buffer>;
-    readFileText(path: string, encoding?: BufferEncoding): Promise<string>;
-    realCasePath(path: string): string;
-    isMappedFilePath(filepath: string): boolean;
-    getOriginalFilePath(mappedFilePath: string): string;
-    getMappedFilePath(originalFilepath: string): string;
-    getUri(path: string): string;
-    isInZip(path: string): boolean;
+    readonly isCaseSensitive: boolean;
+    existsSync(uri: Uri): boolean;
+    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;
+    readFileSync(uri: Uri, encoding?: BufferEncoding | null): string | Buffer;
+    statSync(uri: Uri): Stats;
+    realpathSync(uri: Uri): Uri;
+    getModulePath(): Uri;
+    readFile(uri: Uri): Promise<Buffer>;
+    readFileText(uri: Uri, encoding?: BufferEncoding): Promise<string>;
+    realCasePath(uri: Uri): Uri;
+    isMappedUri(uri: Uri): boolean;
+    getOriginalUri(mappedUri: Uri): Uri;
+    getMappedUri(originalUri: Uri): Uri;
+    isInZip(uri: Uri): boolean;
 }
 export interface FileSystem extends ReadOnlyFileSystem {
-    mkdirSync(path: string, options?: MkDirOptions): void;
-    writeFileSync(path: string, data: string | Buffer, encoding: BufferEncoding | null): void;
-    unlinkSync(path: string): void;
-    rmdirSync(path: string): void;
-    createFileSystemWatcher(paths: string[], listener: FileWatcherEventHandler): FileWatcher;
-    createReadStream(path: string): fs.ReadStream;
-    createWriteStream(path: string): fs.WriteStream;
-    copyFileSync(src: string, dst: string): void;
+    mkdirSync(uri: Uri, options?: MkDirOptions): void;
+    writeFileSync(uri: Uri, data: string | Buffer, encoding: BufferEncoding | null): void;
+    unlinkSync(uri: Uri): void;
+    rmdirSync(uri: Uri): void;
+    createFileSystemWatcher(uris: Uri[], listener: FileWatcherEventHandler): FileWatcher;
+    createReadStream(uri: Uri): fs.ReadStream;
+    createWriteStream(uri: Uri): fs.WriteStream;
+    copyFileSync(uri: Uri, dst: Uri): void;
 }
 export interface TmpfileOptions {
     postfix?: string;
     prefix?: string;
 }
 export interface TempFile {
-    tmpdir(): string;
-    tmpfile(options?: TmpfileOptions): string;
+    tmpdir(): Uri;
+    tmpfile(options?: TmpfileOptions): Uri;
     dispose(): void;
 }
 export declare namespace FileSystem {

package/dist/common/fileWatcher.d.ts

@@ -1,11 +1,12 @@
 import { Stats } from './fileSystem';
+import { Uri } from './uri/uri';
 export type FileWatcherEventType = 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir';
-export type FileWatcherEventHandler = (eventName: FileWatcherEventType, path: string, stats?: Stats) => void;
+export type FileWatcherEventHandler = (eventName: FileWatcherEventType, uri: Uri, stats?: Stats) => void;
 export interface FileWatcher {
     close(): void;
 }
 export interface FileWatcherHandler {
-    onFileChange(eventType: FileWatcherEventType, path: string): void;
+    onFileChange(eventType: FileWatcherEventType, uri: Uri): void;
 }
 export interface FileWatcherProvider {
     createFileWatcher(paths: string[], listener: FileWatcherEventHandler): FileWatcher;

package/dist/common/fileWatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileWatcher.js","sourceRoot":"","sources":["../../../src/common/fileWatcher.ts"],"names":[],"mappings":";;;AAwBa,QAAA,sBAAsB,GAAuB;IACtD,YAAY,CAAC,EAAwB,EAAE,EAAU;QAC7C,aAAa;IACjB,CAAC;CACJ,CAAC;AAEW,QAAA,uBAAuB,GAAwB;IACxD,iBAAiB,CAAC,EAAY,EAAE,EAA2B;QACvD,OAAO,eAAe,CAAC;IAC3B,CAAC;CACJ,CAAC;AAEF,oFAAoF;AACpF,kFAAkF;AAClF,gFAAgF;AAChF,oHAAoH;AACpH,SAAgB,yBAAyB,CAAC,KAAe;IACrD,MAAM,eAAe,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAY,EAAW,EAAE;QAC7B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC3C,OAAO,IAAI,CAAC;SACf;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC;AACN,CAAC;AATD,8DASC;AAED,MAAM,eAAe,GAAgB;IACjC,KAAK;QACD,SAAS;IACb,CAAC;CACJ,CAAC"}
+{"version":3,"file":"fileWatcher.js","sourceRoot":"","sources":["../../../src/common/fileWatcher.ts"],"names":[],"mappings":";;;AAyBa,QAAA,sBAAsB,GAAuB;IACtD,YAAY,CAAC,EAAwB,EAAE,EAAO;QAC1C,aAAa;IACjB,CAAC;CACJ,CAAC;AAEW,QAAA,uBAAuB,GAAwB;IACxD,iBAAiB,CAAC,EAAY,EAAE,EAA2B;QACvD,OAAO,eAAe,CAAC;IAC3B,CAAC;CACJ,CAAC;AAEF,oFAAoF;AACpF,kFAAkF;AAClF,gFAAgF;AAChF,oHAAoH;AACpH,SAAgB,yBAAyB,CAAC,KAAe;IACrD,MAAM,eAAe,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAY,EAAW,EAAE;QAC7B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC3C,OAAO,IAAI,CAAC;SACf;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC;AACN,CAAC;AATD,8DASC;AAED,MAAM,eAAe,GAAgB;IACjC,KAAK;QACD,SAAS;IACb,CAAC;CACJ,CAAC"}

package/dist/common/fullAccessHost.d.ts

@@ -1,21 +1,22 @@
 import { CancellationToken } from 'vscode-languageserver';
 import { PythonPathResult } from '../analyzer/pythonPathUtils';
 import { PythonPlatform } from './configOptions';
-import { FileSystem } from './fileSystem';
 import { HostKind, NoAccessHost, ScriptOutput } from './host';
 import { PythonVersion } from './pythonVersion';
+import { ServiceProvider } from './serviceProvider';
+import { Uri } from './uri/uri';
 export declare class LimitedAccessHost extends NoAccessHost {
     get kind(): HostKind;
     getPythonPlatform(logInfo?: string[]): PythonPlatform | undefined;
 }
 export declare class FullAccessHost extends LimitedAccessHost {
-    protected fs: FileSystem;
-    constructor(fs: FileSystem);
+    protected serviceProvider: ServiceProvider;
+    constructor(serviceProvider: ServiceProvider);
     get kind(): HostKind;
-    static createHost(kind: HostKind, fs: FileSystem): NoAccessHost;
-    getPythonSearchPaths(pythonPath?: string, logInfo?: string[]): PythonPathResult;
-    getPythonVersion(pythonPath?: string, logInfo?: string[]): PythonVersion | undefined;
-    runScript(pythonPath: string | undefined, script: string, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
+    static createHost(kind: HostKind, serviceProvider: ServiceProvider): NoAccessHost;
+    getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
+    getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
+    runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
     private _executePythonInterpreter;
     private _getSearchPathResultFromInterpreter;
 }

package/dist/common/fullAccessHost.js

@@ -38,6 +38,8 @@ const debug_1 = require("./debug");
 const host_1 = require("./host");
 const pathUtils_1 = require("./pathUtils");
 const pythonVersion_1 = require("./pythonVersion");
+const uri_1 = require("./uri/uri");
+const uriUtils_1 = require("./uri/uriUtils");
 // preventLocalImports removes the working directory from sys.path.
 // The -c flag adds it automatically, which can allow some stdlib
 // modules (like json) to be overridden by other files (like json.py).
@@ -77,32 +79,32 @@ class LimitedAccessHost extends host_1.NoAccessHost {
 }
 exports.LimitedAccessHost = LimitedAccessHost;
 class FullAccessHost extends LimitedAccessHost {
-    constructor(fs) {
+    constructor(serviceProvider) {
         super();
-        this.fs = fs;
+        this.serviceProvider = serviceProvider;
     }
     get kind() {
         return 0 /* HostKind.FullAccess */;
     }
-    static createHost(kind, fs) {
+    static createHost(kind, serviceProvider) {
         switch (kind) {
             case 2 /* HostKind.NoAccess */:
                 return new host_1.NoAccessHost();
             case 1 /* HostKind.LimitedAccess */:
                 return new LimitedAccessHost();
             case 0 /* HostKind.FullAccess */:
-                return new FullAccessHost(fs);
+                return new FullAccessHost(serviceProvider);
             default:
                 (0, debug_1.assertNever)(kind);
         }
     }
     getPythonSearchPaths(pythonPath, logInfo) {
         const importFailureInfo = logInfo !== null && logInfo !== void 0 ? logInfo : [];
-        let result = this._executePythonInterpreter(pythonPath, (p) => this._getSearchPathResultFromInterpreter(this.fs, p, importFailureInfo));
+        let result = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => this._getSearchPathResultFromInterpreter(p, importFailureInfo));
         if (!result) {
             result = {
                 paths: [],
-                prefix: '',
+                prefix: undefined,
             };
         }
         importFailureInfo.push(`Received ${result.paths.length} paths from interpreter`);
@@ -115,7 +117,7 @@ class FullAccessHost extends LimitedAccessHost {
         const importFailureInfo = logInfo !== null && logInfo !== void 0 ? logInfo : [];
         try {
             const commandLineArgs = ['-c', extractVersion];
-            const execOutput = this._executePythonInterpreter(pythonPath, (p) => child_process.execFileSync(p, commandLineArgs, { encoding: 'utf8' }));
+            const execOutput = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => child_process.execFileSync(p, commandLineArgs, { encoding: 'utf8' }));
             const versionJson = JSON.parse(execOutput);
             const version = (0, pythonVersion_1.versionFromMajorMinor)(versionJson.major, versionJson.minor);
             if (version === undefined) {
@@ -136,8 +138,8 @@ class FullAccessHost extends LimitedAccessHost {
         return new Promise((resolve, reject) => {
             let stdout = '';
             let stderr = '';
-            const commandLineArgs = [script, ...args];
-            const child = this._executePythonInterpreter(pythonPath, (p) => child_process.spawn(p, commandLineArgs, { cwd }));
+            const commandLineArgs = [script.getFilePath(), ...args];
+            const child = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => child_process.spawn(p, commandLineArgs, { cwd }));
             const tokenWatch = token.onCancellationRequested(() => {
                 if (child) {
                     try {
@@ -199,15 +201,16 @@ class FullAccessHost extends LimitedAccessHost {
             return execute('python');
         }
     }
-    _getSearchPathResultFromInterpreter(fs, interpreter, importFailureInfo) {
+    _getSearchPathResultFromInterpreter(interpreterPath, importFailureInfo) {
         const result = {
             paths: [],
-            prefix: '',
+            prefix: undefined,
         };
         try {
             const commandLineArgs = ['-c', extractSys];
-            importFailureInfo.push(`Executing interpreter: '${interpreter}'`);
-            const execOutput = child_process.execFileSync(interpreter, commandLineArgs, { encoding: 'utf8' });
+            importFailureInfo.push(`Executing interpreter: '${interpreterPath}'`);
+            const execOutput = child_process.execFileSync(interpreterPath, commandLineArgs, { encoding: 'utf8' });
+            const isCaseSensitive = this.serviceProvider.fs().isCaseSensitive;
             // Parse the execOutput. It should be a JSON-encoded array of paths.
             try {
                 const execSplit = JSON.parse(execOutput);
@@ -215,16 +218,18 @@ class FullAccessHost extends LimitedAccessHost {
                     execSplitEntry = execSplitEntry.trim();
                     if (execSplitEntry) {
                         const normalizedPath = (0, pathUtils_1.normalizePath)(execSplitEntry);
+                        const normalizedUri = uri_1.Uri.file(normalizedPath, isCaseSensitive);
                         // Skip non-existent paths and broken zips/eggs.
-                        if (fs.existsSync(normalizedPath) && (0, pathUtils_1.isDirectory)(fs, normalizedPath)) {
-                            result.paths.push(normalizedPath);
+                        if (this.serviceProvider.fs().existsSync(normalizedUri) &&
+                            (0, uriUtils_1.isDirectory)(this.serviceProvider.fs(), normalizedUri)) {
+                            result.paths.push(normalizedUri);
                         }
                         else {
                             importFailureInfo.push(`Skipping '${normalizedPath}' because it is not a valid directory`);
                         }
                     }
                 }
-                result.prefix = execSplit.prefix;
+                result.prefix = uri_1.Uri.file(execSplit.prefix, isCaseSensitive);
                 if (result.paths.length === 0) {
                     importFailureInfo.push(`Found no valid directories`);
                 }

package/dist/common/fullAccessHost.js.map

@@ -1 +1 @@
-{"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../src/common/fullAccessHost.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../src/common/fullAccessHost.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAA+C;AAI/C,2DAA+F;AAC/F,mDAAiD;AACjD,mCAAsC;AACtC,iCAA8D;AAC9D,2CAA4C;AAC5C,mDAAuE;AAEvE,mCAAgC;AAChC,6CAA6C;AAE7C,mEAAmE;AACnE,iEAAiE;AACjE,sEAAsE;AACtE,MAAM,oBAAoB,GAAG;IACzB,yBAAyB;IACzB,6DAA6D;IAC7D,8BAA8B;IAC9B,kDAAkD;IAClD,wEAAwE;CAC3E,CAAC;AAEF,MAAM,UAAU,GAAG;IACf,GAAG,oBAAoB;IACvB,kBAAkB;IAClB,oEAAoE;CACvE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,cAAc,GAAG;IACnB,GAAG,oBAAoB;IACvB,kBAAkB;IAClB,mFAAmF;CACtF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAa,iBAAkB,SAAQ,mBAAY;IAC/C,IAAa,IAAI;QACb,sCAA8B;IAClC,CAAC;IAEQ,iBAAiB,CAAC,OAAkB;QACzC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC/B,OAAO,8BAAc,CAAC,MAAM,CAAC;SAChC;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACrC,OAAO,8BAAc,CAAC,KAAK,CAAC;SAC/B;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACrC,OAAO,8BAAc,CAAC,OAAO,CAAC;SACjC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAhBD,8CAgBC;AAED,MAAa,cAAe,SAAQ,iBAAiB;IACjD,YAAsB,eAAgC;QAClD,KAAK,EAAE,CAAC;QADU,oBAAe,GAAf,eAAe,CAAiB;IAEtD,CAAC;IAED,IAAa,IAAI;QACb,mCAA2B;IAC/B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAc,EAAE,eAAgC;QAC9D,QAAQ,IAAI,EAAE;YACV;gBACI,OAAO,IAAI,mBAAY,EAAE,CAAC;YAC9B;gBACI,OAAO,IAAI,iBAAiB,EAAE,CAAC;YACnC;gBACI,OAAO,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;YAC/C;gBACI,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACL,CAAC;IAEQ,oBAAoB,CAAC,UAAgB,EAAE,OAAkB;QAC9D,MAAM,iBAAiB,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QACxC,IAAI,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CACzE,IAAI,CAAC,mCAAmC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CACjE,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG;gBACL,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,SAAS;aACpB,CAAC;SACL;QAED,iBAAiB,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,KAAK,CAAC,MAAM,yBAAyB,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,iBAAiB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEQ,gBAAgB,CAAC,UAAgB,EAAE,OAAkB;QAC1D,MAAM,iBAAiB,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QAExC,IAAI;YACA,MAAM,eAAe,GAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAC/E,aAAa,CAAC,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CACvE,CAAC;YAEF,MAAM,WAAW,GAAqC,IAAI,CAAC,KAAK,CAAC,UAAW,CAAC,CAAC;YAC9E,MAAM,OAAO,GAAG,IAAA,qCAAqB,EAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;YAC5E,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvB,iBAAiB,CAAC,IAAI,CAClB,kBAAkB,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,kCAAkC,CAC7F,CAAC;gBACF,OAAO,SAAS,CAAC;aACpB;YAED,OAAO,OAAO,CAAC;SAClB;QAAC,MAAM;YACJ,iBAAiB,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YACxE,OAAO,SAAS,CAAC;SACpB;IACL,CAAC;IAEQ,SAAS,CACd,UAA2B,EAC3B,MAAW,EACX,IAAc,EACd,GAAW,EACX,KAAwB;QAExB,0DAA0D;QAC1D,IAAA,gDAA4B,EAAC,KAAK,CAAC,CAAC;QAEpC,+BAA+B;QAC/B,OAAO,IAAI,OAAO,CAAqC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvE,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;YAExD,MAAM,KAAK,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAC1E,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,GAAG,EAAE,CAAC,CACnD,CAAC;YACF,MAAM,UAAU,GAAG,KAAK,CAAC,uBAAuB,CAAC,GAAG,EAAE;gBAClD,IAAI,KAAK,EAAE;oBACP,IAAI;wBACA,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;4BACtC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;gCAC9B,2EAA2E;gCAC3E,aAAa,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC;6BAC9D;iCAAM;gCACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;6BAC3B;yBACJ;qBACJ;oBAAC,MAAM;wBACJ,UAAU;qBACb;iBACJ;gBACD,MAAM,CAAC,IAAI,8CAA0B,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;YACH,IAAI,KAAK,EAAE;gBACP,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACpB,UAAU,CAAC,OAAO,EAAE,CAAC;oBACrB,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBAClB,UAAU,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,UAAU,CAAC,OAAO,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,KAAK,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC,CAAC;aAC9E;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,yBAAyB,CAC7B,UAA8B,EAC9B,OAAwC;QAExC,IAAI,UAAU,EAAE;YACZ,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,MAAqB,CAAC;YAC1B,IAAI;gBACA,wEAAwE;gBACxE,uEAAuE;gBACvE,4EAA4E;gBAC5E,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;oBAC9B,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;iBAC/B;aACJ;YAAC,MAAM;gBACJ,4BAA4B;aAC/B;YAED,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,OAAO,MAAM,CAAC;aACjB;YAED,sEAAsE;YACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC5B;IACL,CAAC;IAEO,mCAAmC,CACvC,eAAuB,EACvB,iBAA2B;QAE3B,MAAM,MAAM,GAAqB;YAC7B,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,SAAS;SACpB,CAAC;QAEF,IAAI;YACA,MAAM,eAAe,GAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACrD,iBAAiB,CAAC,IAAI,CAAC,2BAA2B,eAAe,GAAG,CAAC,CAAC;YACtE,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YACtG,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;YAElE,oEAAoE;YACpE,IAAI;gBACA,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACzC,KAAK,IAAI,cAAc,IAAI,SAAS,CAAC,IAAI,EAAE;oBACvC,cAAc,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;oBACvC,IAAI,cAAc,EAAE;wBAChB,MAAM,cAAc,GAAG,IAAA,yBAAa,EAAC,cAAc,CAAC,CAAC;wBACrD,MAAM,aAAa,GAAG,SAAG,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;wBAChE,gDAAgD;wBAChD,IACI,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;4BACnD,IAAA,sBAAW,EAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,EACvD;4BACE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;yBACpC;6BAAM;4BACH,iBAAiB,CAAC,IAAI,CAAC,aAAa,cAAc,uCAAuC,CAAC,CAAC;yBAC9F;qBACJ;iBACJ;gBAED,MAAM,CAAC,MAAM,GAAG,SAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;gBAE5D,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC3B,iBAAiB,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;iBACxD;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,iBAAiB,CAAC,IAAI,CAAC,4BAA4B,UAAU,GAAG,CAAC,CAAC;gBAClE,MAAM,GAAG,CAAC;aACb;SACJ;QAAC,MAAM;YACJ,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAxMD,wCAwMC"}

package/dist/common/host.d.ts

@@ -2,6 +2,7 @@ import { CancellationToken } from 'vscode-languageserver';
 import { PythonPathResult } from '../analyzer/pythonPathUtils';
 import { PythonPlatform } from './configOptions';
 import { PythonVersion } from './pythonVersion';
+import { Uri } from './uri/uri';
 export declare const enum HostKind {
     FullAccess = 0,
     LimitedAccess = 1,
@@ -13,16 +14,16 @@ export interface ScriptOutput {
 }
 export interface Host {
     readonly kind: HostKind;
-    getPythonSearchPaths(pythonPath?: string, logInfo?: string[]): PythonPathResult;
-    getPythonVersion(pythonPath?: string, logInfo?: string[]): PythonVersion | undefined;
+    getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
+    getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
     getPythonPlatform(logInfo?: string[]): PythonPlatform | undefined;
-    runScript(pythonPath: string | undefined, script: string, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
+    runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
 }
 export declare class NoAccessHost implements Host {
     get kind(): HostKind;
-    getPythonSearchPaths(pythonPath?: string, logInfo?: string[]): PythonPathResult;
-    getPythonVersion(pythonPath?: string, logInfo?: string[]): PythonVersion | undefined;
+    getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
+    getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
     getPythonPlatform(logInfo?: string[]): PythonPlatform | undefined;
-    runScript(pythonPath: string | undefined, scriptPath: string, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
+    runScript(pythonPath: Uri | undefined, scriptPath: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
 }
 export type HostFactory = () => Host;

package/dist/common/host.js

@@ -22,7 +22,7 @@ class NoAccessHost {
         logInfo === null || logInfo === void 0 ? void 0 : logInfo.push('No access to python executable.');
         return {
             paths: [],
-            prefix: '',
+            prefix: undefined,
         };
     }
     getPythonVersion(pythonPath, logInfo) {

package/dist/common/host.js.map

@@ -1 +1 @@
-{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../src/common/host.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAQH,IAAkB,QAIjB;AAJD,WAAkB,QAAQ;IACtB,mDAAU,CAAA;IACV,yDAAa,CAAA;IACb,+CAAQ,CAAA;AACZ,CAAC,EAJiB,QAAQ,wBAAR,QAAQ,QAIzB;AAqBD,MAAa,YAAY;IACrB,IAAI,IAAI;QACJ,iCAAyB;IAC7B,CAAC;IAED,oBAAoB,CAAC,UAAmB,EAAE,OAAkB;QACxD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEjD,OAAO;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,UAAmB,EAAE,OAAkB;QACpD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,iBAAiB,CAAC,OAAkB;QAChC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,SAAS,CACX,UAA8B,EAC9B,UAAkB,EAClB,IAAc,EACd,GAAW,EACX,KAAwB;QAExB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtC,CAAC;CACJ;AA/BD,oCA+BC"}
+{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../src/common/host.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AASH,IAAkB,QAIjB;AAJD,WAAkB,QAAQ;IACtB,mDAAU,CAAA;IACV,yDAAa,CAAA;IACb,+CAAQ,CAAA;AACZ,CAAC,EAJiB,QAAQ,wBAAR,QAAQ,QAIzB;AAqBD,MAAa,YAAY;IACrB,IAAI,IAAI;QACJ,iCAAyB;IAC7B,CAAC;IAED,oBAAoB,CAAC,UAAgB,EAAE,OAAkB;QACrD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEjD,OAAO;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,SAAS;SACpB,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,UAAgB,EAAE,OAAkB;QACjD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,iBAAiB,CAAC,OAAkB;QAChC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,SAAS,CACX,UAA2B,EAC3B,UAAe,EACf,IAAc,EACd,GAAW,EACX,KAAwB;QAExB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtC,CAAC;CACJ;AA/BD,oCA+BC"}

package/dist/common/logTracker.d.ts

@@ -1,6 +1,7 @@
 import { ConsoleInterface } from './console';
 import { ReadOnlyFileSystem } from './fileSystem';
-export declare function getPathForLogging(fs: ReadOnlyFileSystem, filepath: string): string;
+import { Uri } from './uri/uri';
+export declare function getPathForLogging(fs: ReadOnlyFileSystem, fileUri: Uri): Uri;
 export declare class LogTracker {
     private _console;
     private _prefix;

package/dist/common/logTracker.js

@@ -12,11 +12,11 @@ const console_1 = require("./console");
 const timing_1 = require("./timing");
 // Consider an operation "long running" if it goes longer than this.
 const durationThresholdForInfoInMs = 2000;
-function getPathForLogging(fs, filepath) {
-    if (fs.isMappedFilePath(filepath)) {
-        return fs.getOriginalFilePath(filepath);
+function getPathForLogging(fs, fileUri) {
+    if (fs.isMappedUri(fileUri)) {
+        return fs.getOriginalUri(fileUri);
     }
-    return filepath;
+    return fileUri;
 }
 exports.getPathForLogging = getPathForLogging;
 class LogTracker {

package/dist/common/logTracker.js.map

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

package/dist/common/pathUtils.d.ts

@@ -1,8 +1,4 @@
-/// <reference types="node" />
-import type { Dirent } from 'fs';
 import { GetCanonicalFileName } from './core';
-import { ServiceProvider } from './extensibility';
-import { FileSystem, ReadOnlyFileSystem, Stats, TempFile } from './fileSystem';
 export interface FileSpec {
     wildcardRoot: string;
     regExp: RegExp;
@@ -18,22 +14,16 @@ export interface FileSystemEntries {
     files: string[];
     directories: string[];
 }
-export declare function forEachAncestorDirectory(directory: string, callback: (directory: string) => string | undefined): string | undefined;
 export declare function getDirectoryPath(pathString: string): string;
-export declare function isUri(pathString: string): boolean;
 /**
  * Returns length of the root part of a path or URL (i.e. length of "/", "x:/", "//server/").
  */
-export declare function getRootLength(pathString: string, checkUri?: boolean): number;
+export declare function getRootLength(pathString: string, sep?: string): number;
 export declare function getPathSeparator(pathString: string): string;
 export declare function getPathComponents(pathString: string): string[];
 export declare function reducePathComponents(components: readonly string[]): string[];
 export declare function combinePathComponents(components: string[]): string;
 export declare function getRelativePath(dirPath: string, relativeTo: string): string | undefined;
-export declare function makeDirectories(fs: FileSystem, dirPath: string, startingFromDirPath: string): void;
-export declare function getFileSize(fs: ReadOnlyFileSystem, path: string): number;
-export declare function fileExists(fs: ReadOnlyFileSystem, path: string): boolean;
-export declare function directoryExists(fs: ReadOnlyFileSystem, path: string): boolean;
 export declare function normalizeSlashes(pathString: string, sep?: string): string;
 /**
  * Combines and resolves paths. If a path is absolute, it replaces any previous path. Any
@@ -137,19 +127,11 @@ export declare function getFileExtension(fileName: string, multiDotExtension?: b
 export declare function getFileName(pathString: string): string;
 export declare function getShortenedFileName(pathString: string, maxDirLength?: number): string;
 export declare function stripFileExtension(fileName: string, multiDotExtension?: boolean): string;
-export declare function realCasePath(pathString: string, fileSystem: ReadOnlyFileSystem): string;
 export declare function normalizePath(pathString: string): string;
-export declare function isDirectory(fs: ReadOnlyFileSystem, path: string): boolean;
-export declare function isFile(fs: ReadOnlyFileSystem, path: string, treatZipDirectoryAsFile?: boolean): boolean;
-export declare function tryStat(fs: ReadOnlyFileSystem, path: string): Stats | undefined;
-export declare function tryRealpath(fs: ReadOnlyFileSystem, path: string): string | undefined;
-export declare function getFileSystemEntries(fs: ReadOnlyFileSystem, path: string): FileSystemEntries;
-export declare function getFileSystemEntriesFromDirEntries(dirEntries: Dirent[], fs: ReadOnlyFileSystem, path: string): FileSystemEntries;
 export declare function getWildcardRegexPattern(rootPath: string, fileSpec: string): string;
 export declare function isDirectoryWildcardPatternPresent(fileSpec: string): boolean;
 export declare function getWildcardRoot(rootPath: string, fileSpec: string): string;
 export declare function hasPythonExtension(path: string): boolean;
-export declare function getFileSpec(sp: ServiceProvider, rootPath: string, fileSpec: string): FileSpec;
 export declare function getRegexEscapedSeparator(pathSep?: string): "/" | "\\\\";
 /**
  * Determines whether a path is an absolute disk path (e.g. starts with `/`, or a dos path
@@ -160,12 +142,3 @@ export declare function isRootedDiskPath(path: string): boolean;
  * Determines whether a path consists only of a path root.
  */
 export declare function isDiskPathRoot(path: string): boolean;
-export declare function convertUriToPath(fs: ReadOnlyFileSystem, uriString: string): string;
-export declare function extractPathFromUri(uriString: string): string;
-export declare function convertPathToUri(fs: ReadOnlyFileSystem, path: string): string;
-export declare function setTestingMode(underTest: boolean): void;
-export declare function isFileSystemCaseSensitive(fs: FileSystem, tmp?: TempFile): boolean;
-export declare function isFileSystemCaseSensitiveInternal(fs: FileSystem, tmp: TempFile): boolean;
-export declare function getLibraryPathWithoutExtension(libraryFilePath: string): string;
-export declare function getDirectoryChangeKind(fs: ReadOnlyFileSystem, oldDirectory: string, newDirectory: string): 'Same' | 'Renamed' | 'Moved';
-export declare function deduplicateFolders(listOfFolders: string[][]): string[];