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

package/dist/common/uri/webUri.d.ts

@@ -0,0 +1,36 @@
+import { BaseUri } from './baseUri';
+import { Uri } from './uri';
+export declare class WebUri extends BaseUri {
+    private readonly _scheme;
+    private readonly _authority;
+    private readonly _path;
+    private readonly _query;
+    private readonly _fragment;
+    private readonly _originalString;
+    private constructor();
+    get scheme(): string;
+    get isCaseSensitive(): boolean;
+    get root(): Uri;
+    get fileName(): string;
+    get lastExtension(): string;
+    static createWebUri(scheme: string, authority: string, path: string, query: string, fragment: string, originalString: string | undefined): WebUri;
+    toString(): string;
+    toUserVisibleString(): string;
+    static isWebUri(uri: any): uri is WebUri;
+    static fromJsonObj(obj: WebUri): WebUri;
+    matchesRegex(regex: RegExp): boolean;
+    addPath(extra: string): Uri;
+    isRoot(): boolean;
+    isChild(parent: Uri): boolean;
+    isLocal(): boolean;
+    startsWith(other: Uri | undefined): boolean;
+    getPathLength(): number;
+    getPath(): string;
+    getFilePath(): string;
+    combinePaths(...paths: string[]): Uri;
+    getDirectory(): Uri;
+    protected getPathComponentsImpl(): string[];
+    protected getRootPath(): string;
+    protected getComparablePath(): string;
+    private static _createKey;
+}

package/dist/common/uri/webUri.js

@@ -0,0 +1,207 @@
+"use strict";
+/*
+ * webUri.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * URI class that represents a URI that isn't 'file' schemed.
+ * This can be URIs like:
+ * - http://www.microsoft.com/file.txt
+ * - untitled:Untitled-1
+ * - vscode:extension/ms-python.python
+ * - vscode-vfs://github.com/microsoft/debugpy/debugpy/launcher/debugAdapter.py
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebUri = void 0;
+const debug = __importStar(require("../debug"));
+const pathUtils_1 = require("../pathUtils");
+const baseUri_1 = require("./baseUri");
+const memoization_1 = require("./memoization");
+class WebUri extends baseUri_1.BaseUri {
+    constructor(key, _scheme, _authority, _path, _query, _fragment, _originalString) {
+        super(key);
+        this._scheme = _scheme;
+        this._authority = _authority;
+        this._path = _path;
+        this._query = _query;
+        this._fragment = _fragment;
+        this._originalString = _originalString;
+    }
+    get scheme() {
+        return this._scheme;
+    }
+    get isCaseSensitive() {
+        // Web URIs are always case sensitive
+        return true;
+    }
+    get root() {
+        const rootPath = this.getRootPath();
+        if (rootPath !== this._path) {
+            return WebUri.createWebUri(this._scheme, this._authority, rootPath, '', '', undefined);
+        }
+        return this;
+    }
+    get fileName() {
+        // Path should already be normalized, just get the last on a split of '/'.
+        const components = this._path.split('/');
+        return components[components.length - 1];
+    }
+    get lastExtension() {
+        const basename = this.fileName;
+        const index = basename.lastIndexOf('.');
+        if (index >= 0) {
+            return basename.slice(index);
+        }
+        return '';
+    }
+    static createWebUri(scheme, authority, path, query, fragment, originalString) {
+        const key = WebUri._createKey(scheme, authority, path, query, fragment);
+        return new WebUri(key, scheme, authority, path, query, fragment, originalString);
+    }
+    toString() {
+        if (!this._originalString) {
+            return `${this._scheme}://${this._authority}${this._path}${this._query ? '?' + this._query : ''}${this._fragment ? '#' + this._fragment : ''}`;
+        }
+        return this._originalString;
+    }
+    toUserVisibleString() {
+        return this.toString();
+    }
+    static isWebUri(uri) {
+        return (uri === null || uri === void 0 ? void 0 : uri._scheme) !== undefined && (uri === null || uri === void 0 ? void 0 : uri._key) !== undefined;
+    }
+    static fromJsonObj(obj) {
+        return WebUri.createWebUri(obj._scheme, obj._authority, obj._path, obj._query, obj._fragment, obj._originalString);
+    }
+    matchesRegex(regex) {
+        return regex.test(this._path);
+    }
+    addPath(extra) {
+        const newPath = this._path + extra;
+        return WebUri.createWebUri(this._scheme, this._authority, newPath, this._query, this._fragment, undefined);
+    }
+    isRoot() {
+        return this._path === this.getRootPath() && this._path.length > 0;
+    }
+    isChild(parent) {
+        if (!WebUri.isWebUri(parent)) {
+            return false;
+        }
+        return parent._path.length < this._path.length && this.startsWith(parent);
+    }
+    isLocal() {
+        return false;
+    }
+    startsWith(other) {
+        if (!other || !WebUri.isWebUri(other)) {
+            return false;
+        }
+        if (other.isEmpty() !== this.isEmpty()) {
+            return false;
+        }
+        if (this.scheme !== other.scheme) {
+            return false;
+        }
+        if (this._path.length >= other._path.length) {
+            // Make sure the other ends with a / when comparing longer paths, otherwise we might
+            // say that /a/food is a child of /a/foo.
+            const otherPath = this._path.length > other._path.length && !(0, pathUtils_1.hasTrailingDirectorySeparator)(other._path)
+                ? `${other._path}/`
+                : other._path;
+            return this._path.startsWith(otherPath);
+        }
+        return false;
+    }
+    getPathLength() {
+        return this._path.length;
+    }
+    getPath() {
+        return this._path;
+    }
+    getFilePath() {
+        debug.fail(`${this} is not a file based URI.`);
+    }
+    combinePaths(...paths) {
+        // Resolve and combine paths, never want URIs with '..' in the middle.
+        let combined = this.normalizeSlashes((0, pathUtils_1.resolvePaths)(this._path, ...paths));
+        // Make sure to remove any trailing directory chars.
+        if ((0, pathUtils_1.hasTrailingDirectorySeparator)(combined) && combined.length > 1) {
+            combined = combined.slice(0, combined.length - 1);
+        }
+        if (combined !== this._path) {
+            return WebUri.createWebUri(this._scheme, this._authority, combined, '', '', undefined);
+        }
+        return this;
+    }
+    getDirectory() {
+        const index = this._path.lastIndexOf('/');
+        if (index > 0) {
+            return WebUri.createWebUri(this._scheme, this._authority, this._path.slice(0, index), this._query, this._fragment, undefined);
+        }
+        else {
+            return this;
+        }
+    }
+    getPathComponentsImpl() {
+        // Get the root path and the rest of the path components.
+        const rootPath = this.getRootPath();
+        const otherPaths = this._path.slice(rootPath.length).split('/');
+        return this.reducePathComponents([rootPath, ...otherPaths]).map((component) => this.normalizeSlashes(component));
+    }
+    getRootPath() {
+        const rootLength = (0, pathUtils_1.getRootLength)(this._path, '/');
+        return this._path.slice(0, rootLength);
+    }
+    getComparablePath() {
+        return (0, pathUtils_1.normalizeSlashes)(this._path);
+    }
+    static _createKey(scheme, authority, path, query, fragment) {
+        return `${scheme}://${authority}${path}${query ? '?' + query : ''}${fragment ? '#' + fragment : ''}`;
+    }
+}
+exports.WebUri = WebUri;
+__decorate([
+    (0, memoization_1.cacheProperty)()
+], WebUri.prototype, "root", null);
+__decorate([
+    (0, memoization_1.cacheProperty)()
+], WebUri.prototype, "fileName", null);
+__decorate([
+    (0, memoization_1.cacheProperty)()
+], WebUri.prototype, "lastExtension", null);
+__decorate([
+    (0, memoization_1.cacheMethodWithNoArgs)()
+], WebUri.prototype, "getDirectory", null);
+__decorate([
+    (0, memoization_1.cacheStaticFunc)()
+], WebUri, "createWebUri", null);
+//# sourceMappingURL=webUri.js.map

package/dist/common/uri/webUri.js.map

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

package/dist/common/workspaceEditUtils.d.ts

@@ -2,18 +2,18 @@ import { ChangeAnnotation, TextEdit, WorkspaceEdit } from 'vscode-languageserver
 import { AnalyzerService } from '../analyzer/service';
 import { FileEditAction, FileEditActions, TextEditAction } from '../common/editAction';
 import { EditableProgram, SourceFileInfo } from './extensibility';
-import { ReadOnlyFileSystem } from './fileSystem';
 import { TextRange } from './textRange';
 import { TextRangeCollection } from './textRangeCollection';
+import { Uri } from './uri/uri';
 export declare function convertToTextEdits(editActions: TextEditAction[]): TextEdit[];
-export declare function convertToFileTextEdits(filePath: string, editActions: TextEditAction[]): FileEditAction[];
-export declare function convertToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditAction[]): WorkspaceEdit;
-export declare function convertToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditActions): WorkspaceEdit;
-export declare function convertToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditActions, changeAnnotations: {
+export declare function convertToFileTextEdits(fileUri: Uri, editActions: TextEditAction[]): FileEditAction[];
+export declare function convertToWorkspaceEdit(edits: FileEditAction[]): WorkspaceEdit;
+export declare function convertToWorkspaceEdit(edits: FileEditActions): WorkspaceEdit;
+export declare function convertToWorkspaceEdit(edits: FileEditActions, changeAnnotations: {
     [id: string]: ChangeAnnotation;
 }, defaultAnnotationId: string): WorkspaceEdit;
-export declare function appendToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditAction[], workspaceEdit: WorkspaceEdit): void;
+export declare function appendToWorkspaceEdit(edits: FileEditAction[], workspaceEdit: WorkspaceEdit): void;
 export declare function applyTextEditsToString(edits: TextEditAction[], lines: TextRangeCollection<TextRange>, originalText: string): string;
-export declare function applyWorkspaceEdit(program: EditableProgram, edits: WorkspaceEdit, filesChanged: Set<string>): void;
+export declare function applyWorkspaceEdit(program: EditableProgram, edits: WorkspaceEdit, filesChanged: Map<string, Uri>): void;
 export declare function applyDocumentChanges(program: EditableProgram, fileInfo: SourceFileInfo, edits: TextEdit[]): void;
-export declare function generateWorkspaceEdit(originalService: AnalyzerService, clonedService: AnalyzerService, filesChanged: Set<string>): WorkspaceEdit;
+export declare function generateWorkspaceEdit(originalService: AnalyzerService, clonedService: AnalyzerService, filesChanged: Map<string, Uri>): WorkspaceEdit;

package/dist/common/workspaceEditUtils.js

@@ -10,12 +10,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWorkspaceEdit = exports.applyDocumentChanges = exports.applyWorkspaceEdit = exports.applyTextEditsToString = exports.appendToWorkspaceEdit = exports.convertToWorkspaceEdit = exports.convertToFileTextEdits = exports.convertToTextEdits = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const pathUtils_1 = require("../common/pathUtils");
 const collectionUtils_1 = require("./collectionUtils");
 const core_1 = require("./core");
 const debug_1 = require("./debug");
 const positionUtils_1 = require("./positionUtils");
 const textRange_1 = require("./textRange");
+const uri_1 = require("./uri/uri");
 function convertToTextEdits(editActions) {
     return editActions.map((editAction) => ({
         range: editAction.range,
@@ -23,22 +23,22 @@ function convertToTextEdits(editActions) {
     }));
 }
 exports.convertToTextEdits = convertToTextEdits;
-function convertToFileTextEdits(filePath, editActions) {
-    return editActions.map((a) => ({ filePath, ...a }));
+function convertToFileTextEdits(fileUri, editActions) {
+    return editActions.map((a) => ({ fileUri, ...a }));
 }
 exports.convertToFileTextEdits = convertToFileTextEdits;
-function convertToWorkspaceEdit(fs, edits, changeAnnotations, defaultAnnotationId = 'default') {
+function convertToWorkspaceEdit(edits, changeAnnotations, defaultAnnotationId = 'default') {
     if ((0, core_1.isArray)(edits)) {
-        return _convertToWorkspaceEditWithChanges(fs, edits);
+        return _convertToWorkspaceEditWithChanges(edits);
     }
-    return _convertToWorkspaceEditWithDocumentChanges(fs, edits, changeAnnotations, defaultAnnotationId);
+    return _convertToWorkspaceEditWithDocumentChanges(edits, changeAnnotations, defaultAnnotationId);
 }
 exports.convertToWorkspaceEdit = convertToWorkspaceEdit;
-function appendToWorkspaceEdit(fs, edits, workspaceEdit) {
+function appendToWorkspaceEdit(edits, workspaceEdit) {
     edits.forEach((edit) => {
-        const uri = (0, pathUtils_1.convertPathToUri)(fs, edit.filePath);
-        workspaceEdit.changes[uri] = workspaceEdit.changes[uri] || [];
-        workspaceEdit.changes[uri].push({ range: edit.range, newText: edit.replacementText });
+        const uri = edit.fileUri;
+        workspaceEdit.changes[uri.toString()] = workspaceEdit.changes[uri.toString()] || [];
+        workspaceEdit.changes[uri.toString()].push({ range: edit.range, newText: edit.replacementText });
     });
 }
 exports.appendToWorkspaceEdit = appendToWorkspaceEdit;
@@ -69,28 +69,28 @@ exports.applyTextEditsToString = applyTextEditsToString;
 function applyWorkspaceEdit(program, edits, filesChanged) {
     if (edits.changes) {
         for (const kv of Object.entries(edits.changes)) {
-            const filePath = (0, pathUtils_1.convertUriToPath)(program.fileSystem, kv[0]);
-            const fileInfo = program.getSourceFileInfo(filePath);
+            const fileUri = uri_1.Uri.parse(kv[0], program.configOptions.projectRoot.isCaseSensitive);
+            const fileInfo = program.getSourceFileInfo(fileUri);
             if (!fileInfo || !fileInfo.isTracked) {
                 // We don't allow non user file being modified.
                 continue;
             }
             applyDocumentChanges(program, fileInfo, kv[1]);
-            filesChanged.add(filePath);
+            filesChanged.set(fileUri.key, fileUri);
         }
     }
     // For now, we don't support annotations.
     if (edits.documentChanges) {
         for (const change of edits.documentChanges) {
             if (vscode_languageserver_1.TextDocumentEdit.is(change)) {
-                const filePath = (0, pathUtils_1.convertUriToPath)(program.fileSystem, change.textDocument.uri);
-                const fileInfo = program.getSourceFileInfo(filePath);
+                const fileUri = uri_1.Uri.parse(change.textDocument.uri, program.configOptions.projectRoot.isCaseSensitive);
+                const fileInfo = program.getSourceFileInfo(fileUri);
                 if (!fileInfo || !fileInfo.isTracked) {
                     // We don't allow non user file being modified.
                     continue;
                 }
                 applyDocumentChanges(program, fileInfo, change.edits);
-                filesChanged.add(filePath);
+                filesChanged.set(fileUri.key, fileUri);
             }
             // For now, we don't support other kinds of text changes.
             // But if we want to add support for those in future, we should add them here.
@@ -102,21 +102,20 @@ function applyDocumentChanges(program, fileInfo, edits) {
     var _a, _b, _c, _d;
     if (!fileInfo.isOpenByClient) {
         const fileContent = fileInfo.sourceFile.getFileContent();
-        program.setFileOpened(fileInfo.sourceFile.getFilePath(), 0, fileContent !== null && fileContent !== void 0 ? fileContent : '', {
+        program.setFileOpened(fileInfo.sourceFile.getUri(), 0, fileContent !== null && fileContent !== void 0 ? fileContent : '', {
             isTracked: fileInfo.isTracked,
             ipythonMode: fileInfo.sourceFile.getIPythonMode(),
-            chainedFilePath: (_a = fileInfo.chainedSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.getFilePath(),
-            realFilePath: fileInfo.sourceFile.getRealFilePath(),
+            chainedFileUri: (_a = fileInfo.chainedSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.getUri(),
         });
     }
     const version = (_b = fileInfo.sourceFile.getClientVersion()) !== null && _b !== void 0 ? _b : 0;
-    const filePath = fileInfo.sourceFile.getFilePath();
+    const fileUri = fileInfo.sourceFile.getUri();
+    const filePath = fileUri.getFilePath();
     const sourceDoc = vscode_languageserver_textdocument_1.TextDocument.create(filePath, 'python', version, (_c = fileInfo.sourceFile.getOpenFileContents()) !== null && _c !== void 0 ? _c : '');
-    program.setFileOpened(filePath, version + 1, vscode_languageserver_textdocument_1.TextDocument.applyEdits(sourceDoc, edits), {
+    program.setFileOpened(fileUri, version + 1, vscode_languageserver_textdocument_1.TextDocument.applyEdits(sourceDoc, edits), {
         isTracked: fileInfo.isTracked,
         ipythonMode: fileInfo.sourceFile.getIPythonMode(),
-        chainedFilePath: (_d = fileInfo.chainedSourceFile) === null || _d === void 0 ? void 0 : _d.sourceFile.getFilePath(),
-        realFilePath: fileInfo.sourceFile.getRealFilePath(),
+        chainedFileUri: (_d = fileInfo.chainedSourceFile) === null || _d === void 0 ? void 0 : _d.sourceFile.getUri(),
     });
 }
 exports.applyDocumentChanges = applyDocumentChanges;
@@ -127,9 +126,9 @@ function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
     // doing minimal changes using vscode's differ (https://github.com/microsoft/vscode/blob/main/src/vs/base/common/diff/diff.ts)
     // to support annotation.
     const edits = { changes: {} };
-    for (const filePath of filesChanged) {
-        const original = originalService.backgroundAnalysisProgram.program.getBoundSourceFile(filePath);
-        const final = clonedService.backgroundAnalysisProgram.program.getBoundSourceFile(filePath);
+    for (const uri of filesChanged.values()) {
+        const original = originalService.backgroundAnalysisProgram.program.getBoundSourceFile(uri);
+        const final = clonedService.backgroundAnalysisProgram.program.getBoundSourceFile(uri);
         if (!original || !final) {
             // Both must exist.
             continue;
@@ -138,7 +137,7 @@ function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
         if (!parseResults) {
             continue;
         }
-        edits.changes[(0, pathUtils_1.convertPathToUri)(originalService.fs, filePath)] = [
+        edits.changes[uri.toString()] = [
             {
                 range: (0, positionUtils_1.convertTextRangeToRange)(parseResults.parseTree, parseResults.tokenizerOutput.lines),
                 newText: (_a = final.getFileContent()) !== null && _a !== void 0 ? _a : '',
@@ -148,14 +147,14 @@ function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
     return edits;
 }
 exports.generateWorkspaceEdit = generateWorkspaceEdit;
-function _convertToWorkspaceEditWithChanges(fs, edits) {
+function _convertToWorkspaceEditWithChanges(edits) {
     const workspaceEdit = {
         changes: {},
     };
-    appendToWorkspaceEdit(fs, edits, workspaceEdit);
+    appendToWorkspaceEdit(edits, workspaceEdit);
     return workspaceEdit;
 }
-function _convertToWorkspaceEditWithDocumentChanges(fs, editActions, changeAnnotations, defaultAnnotationId = 'default') {
+function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotations, defaultAnnotationId = 'default') {
     const workspaceEdit = {
         documentChanges: [],
         changeAnnotations: changeAnnotations,
@@ -165,8 +164,7 @@ function _convertToWorkspaceEditWithDocumentChanges(fs, editActions, changeAnnot
     for (const operation of editActions.fileOperations) {
         switch (operation.kind) {
             case 'create':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.filePath), 
-                /* options */ undefined, defaultAnnotationId));
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create(operation.fileUri.toString(), /* options */ undefined, defaultAnnotationId));
                 break;
             case 'rename':
             case 'delete':
@@ -176,9 +174,9 @@ function _convertToWorkspaceEditWithDocumentChanges(fs, editActions, changeAnnot
         }
     }
     // Text edit's file path must refer to original file paths unless it is a new file just created.
-    const mapPerFile = (0, collectionUtils_1.createMapFromItems)(editActions.edits, (e) => e.filePath);
+    const mapPerFile = (0, collectionUtils_1.createMapFromItems)(editActions.edits, (e) => e.fileUri.key);
     for (const [key, value] of mapPerFile) {
-        workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri: (0, pathUtils_1.convertPathToUri)(fs, key), version: null }, Array.from(value.map((v) => ({
+        workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri: key, version: null }, Array.from(value.map((v) => ({
             range: v.range,
             newText: v.replacementText,
             annotationId: defaultAnnotationId,
@@ -189,12 +187,11 @@ function _convertToWorkspaceEditWithDocumentChanges(fs, editActions, changeAnnot
             case 'create':
                 break;
             case 'rename':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.oldFilePath), (0, pathUtils_1.convertPathToUri)(fs, operation.newFilePath), 
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create(operation.oldFileUri.toString(), operation.newFileUri.toString(), 
                 /* options */ undefined, defaultAnnotationId));
                 break;
             case 'delete':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.filePath), 
-                /* options */ undefined, defaultAnnotationId));
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create(operation.fileUri.toString(), /* options */ undefined, defaultAnnotationId));
                 break;
             default:
                 (0, debug_1.assertNever)(operation);

package/dist/common/workspaceEditUtils.js.map

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

package/dist/languageServerBase.d.ts

@@ -22,23 +22,23 @@ import { Host } from './common/host';
 import { ProgressReporter } from './common/progressReporter';
 import { ServiceProvider } from './common/serviceProvider';
 import { DocumentRange, Position, Range } from './common/textRange';
-import { UriParser } from './common/uriParser';
+import { Uri } from './common/uri/uri';
 import { DefinitionFilter } from './languageService/definitionProvider';
 import { CollectionResult } from './languageService/documentSymbolCollector';
 import { ParseResults } from './parser/parser';
 import { InitStatus, Workspace, WorkspaceFactory } from './workspaceFactory';
 export interface ServerSettings {
-    venvPath?: string | undefined;
-    pythonPath?: string | undefined;
-    typeshedPath?: string | undefined;
-    stubPath?: string | undefined;
+    venvPath?: Uri | undefined;
+    pythonPath?: Uri | undefined;
+    typeshedPath?: Uri | undefined;
+    stubPath?: Uri | undefined;
     openFilesOnly?: boolean | undefined;
     typeCheckingMode?: string | undefined;
     useLibraryCodeForTypes?: boolean | undefined;
     disableLanguageServices?: boolean | undefined;
     disableOrganizeImports?: boolean | undefined;
     autoSearchPaths?: boolean | undefined;
-    extraPaths?: string[] | undefined;
+    extraPaths?: Uri[] | undefined;
     watchForSourceChanges?: boolean | undefined;
     watchForLibraryChanges?: boolean | undefined;
     watchForConfigChanges?: boolean | undefined;
@@ -67,21 +67,20 @@ export interface WindowInterface {
     showInformationMessage(message: string, ...actions: MessageAction[]): Promise<MessageAction | undefined>;
 }
 export interface LanguageServerInterface {
-    readonly rootPath: string;
+    readonly rootUri: Uri;
     readonly console: ConsoleInterface;
     readonly window: WindowInterface;
     readonly supportAdvancedEdits: boolean;
     getWorkspaces(): Promise<Workspace[]>;
-    getWorkspaceForFile(filePath: string): Promise<Workspace>;
+    getWorkspaceForFile(fileUri: Uri): Promise<Workspace>;
     getSettings(workspace: Workspace): Promise<ServerSettings>;
     createBackgroundAnalysis(serviceId: string): BackgroundAnalysisBase | undefined;
     reanalyze(): void;
     restart(): void;
-    decodeTextDocumentUri(uriString: string): string;
 }
 export interface ServerOptions {
     productName: string;
-    rootDirectory: string;
+    rootDirectory: Uri;
     version: string;
     cancellationProvider: CancellationProvider;
     serviceProvider: ServiceProvider;
@@ -177,26 +176,24 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     private _lastFileWatcherRegistration;
     private _initialized;
     private _workspaceFoldersChangedDisposable;
-    rootPath: string;
+    rootUri: Uri;
     protected client: ClientCapabilities;
     protected defaultClientConfig: any;
     protected readonly workspaceFactory: WorkspaceFactory;
     protected readonly openFileMap: Map<string, TextDocument>;
     protected readonly fs: FileSystem;
     protected readonly documentsWithDiagnostics: Set<string>;
-    readonly uriParser: UriParser;
-    constructor(serverOptions: ServerOptions, connection: Connection, uriParserFactory?: (fs: FileSystem) => UriParser);
+    constructor(serverOptions: ServerOptions, connection: Connection);
     get console(): ConsoleInterface;
     get window(): RemoteWindow;
     get supportAdvancedEdits(): boolean;
     dispose(): void;
-    decodeTextDocumentUri(uriString: string): string;
     abstract createBackgroundAnalysis(serviceId: string): BackgroundAnalysisBase | undefined;
     abstract getSettings(workspace: Workspace): Promise<ServerSettings>;
     createAnalyzerService(name: string, services?: WorkspaceServices, libraryReanalysisTimeProvider?: () => number): AnalyzerService;
     getWorkspaces(): Promise<Workspace[]>;
-    getWorkspaceForFile(filePath: string, pythonPath?: string): Promise<Workspace>;
-    getContainingWorkspacesForFile(filePath: string): Promise<Workspace[]>;
+    getWorkspaceForFile(fileUri: Uri, pythonPath?: Uri): Promise<Workspace>;
+    getContainingWorkspacesForFile(fileUri: Uri): Promise<Workspace[]>;
     reanalyze(): void;
     restart(): void;
     updateSettingsForAllWorkspaces(): void;
@@ -205,8 +202,8 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     protected abstract executeCommand(params: ExecuteCommandParams, token: CancellationToken): Promise<any>;
     protected abstract isLongRunningCommand(command: string): boolean;
     protected abstract executeCodeAction(params: CodeActionParams, token: CancellationToken): Promise<(Command | CodeAction)[] | undefined | null>;
-    protected isPythonPathImmutable(filePath: string): boolean;
-    protected getConfiguration(scopeUri: string | undefined, section: string): Promise<any>;
+    protected isPythonPathImmutable(fileUri: Uri): boolean;
+    protected getConfiguration(scopeUri: Uri | undefined, section: string): Promise<any>;
     protected isOpenFilesOnly(diagnosticMode: string): boolean;
     protected getSeverityOverrides(value: string | boolean): DiagnosticSeverityOverrides | undefined;
     protected getDiagnosticRuleName(value: string): DiagnosticRule | undefined;
@@ -220,8 +217,8 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     protected onDefinition(params: TextDocumentPositionParams, token: CancellationToken): Promise<Definition | DefinitionLink[] | undefined | null>;
     protected onDeclaration(params: TextDocumentPositionParams, token: CancellationToken): Promise<Declaration | DeclarationLink[] | undefined | null>;
     protected onTypeDefinition(params: TextDocumentPositionParams, token: CancellationToken): Promise<Definition | DefinitionLink[] | undefined | null>;
-    protected getDefinitions(params: TextDocumentPositionParams, token: CancellationToken, filter: DefinitionFilter, getDefinitionsFunc: (workspace: Workspace, filePath: string, position: Position, filter: DefinitionFilter, token: CancellationToken) => DocumentRange[] | undefined): Promise<Location[] | undefined>;
-    protected onReferences(params: ReferenceParams, token: CancellationToken, workDoneReporter: WorkDoneProgressReporter, resultReporter: ResultProgressReporter<Location[]> | undefined, createDocumentRange?: (filePath: string, result: CollectionResult, parseResults: ParseResults) => DocumentRange, convertToLocation?: (fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined): Promise<Location[] | null | undefined>;
+    protected getDefinitions(params: TextDocumentPositionParams, token: CancellationToken, filter: DefinitionFilter, getDefinitionsFunc: (workspace: Workspace, fileUri: Uri, position: Position, filter: DefinitionFilter, token: CancellationToken) => DocumentRange[] | undefined): Promise<Location[] | undefined>;
+    protected onReferences(params: ReferenceParams, token: CancellationToken, workDoneReporter: WorkDoneProgressReporter, resultReporter: ResultProgressReporter<Location[]> | undefined, createDocumentRange?: (uri: Uri, result: CollectionResult, parseResults: ParseResults) => DocumentRange, convertToLocation?: (fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined): Promise<Location[] | null | undefined>;
     protected onDocumentSymbol(params: DocumentSymbolParams, token: CancellationToken): Promise<DocumentSymbol[] | SymbolInformation[] | null | undefined>;
     protected onWorkspaceSymbol(params: WorkspaceSymbolParams, token: CancellationToken, resultReporter: ResultProgressReporter<SymbolInformation[]> | undefined): Promise<SymbolInformation[] | WorkspaceSymbol[] | null | undefined>;
     protected onHover(params: HoverParams, token: CancellationToken): Promise<import("vscode-languageserver-types").Hover | null>;
@@ -249,11 +246,11 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     protected onAnalysisCompletedHandler(fs: FileSystem, results: AnalysisResults): void;
     protected onWorkspaceCreated(workspace: Workspace): void;
     protected onWorkspaceRemoved(workspace: Workspace): void;
-    protected createAnalyzerServiceForWorkspace(name: string, _rootPath: string, _uri: string, kinds: string[], services?: WorkspaceServices): AnalyzerService;
+    protected createAnalyzerServiceForWorkspace(name: string, uri: Uri, kinds: string[], services?: WorkspaceServices): AnalyzerService;
     protected recordUserInteractionTime(): void;
     protected getDocumentationUrlForDiagnostic(diag: AnalyzerDiagnostic): string | undefined;
     protected abstract createProgressReporter(): ProgressReporter;
-    protected canNavigateToFile(path: string, fs: FileSystem): boolean;
+    protected canNavigateToFile(path: Uri, fs: FileSystem): boolean;
     protected getProgressReporter(reporter: WorkDoneProgressReporter, title: string, token: CancellationToken): Promise<{
         reporter: WorkDoneProgressReporter;
         source: AbstractCancellationTokenSource;