@zzzen/pyright-internal 1.2.0-dev.20231231 → 1.2.0-dev.20240114

package/dist/common/serviceProvider.js

@@ -100,7 +100,14 @@ class ServiceProvider {
     }
     clone() {
         const serviceProvider = new ServiceProvider();
-        this._container.forEach((value, key) => serviceProvider._container.set(key, value));
+        this._container.forEach((value, key) => {
+            if (key.kind === 'group') {
+                serviceProvider._container.set(key, [...(value !== null && value !== void 0 ? value : [])]);
+            }
+            else {
+                serviceProvider._container.set(key, value);
+            }
+        });
         return serviceProvider;
     }
     _addGroupService(key, newValue) {

package/dist/common/serviceProvider.js.map

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

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

@@ -6,7 +6,7 @@ export declare abstract class BaseUri implements Uri {
     abstract get scheme(): string;
     abstract get isCaseSensitive(): boolean;
     abstract get fileName(): string;
-    get fileNameWithoutExtension(): string;
+    get fileNameWithoutExtensions(): string;
     abstract get lastExtension(): string;
     abstract get root(): Uri;
     get packageUri(): Uri;
@@ -14,6 +14,7 @@ export declare abstract class BaseUri implements Uri {
     get initPyUri(): Uri;
     get initPyiUri(): Uri;
     get pytypedUri(): Uri;
+    abstract get fragment(): string;
     isEmpty(): boolean;
     abstract toString(): string;
     abstract toUserVisibleString(): string;
@@ -21,6 +22,8 @@ export declare abstract class BaseUri implements Uri {
     replaceExtension(ext: string): Uri;
     addExtension(ext: string): Uri;
     hasExtension(ext: string): boolean;
+    containsExtension(ext: string): boolean;
+    abstract withFragment(fragment: string): Uri;
     abstract addPath(extra: string): Uri;
     abstract getDirectory(): Uri;
     getRootPathLength(): number;

package/dist/common/uri/baseUri.js

@@ -19,7 +19,7 @@ class BaseUri {
         return this._key;
     }
     // Returns just the fileName without any extensions
-    get fileNameWithoutExtension() {
+    get fileNameWithoutExtensions() {
         const fileName = this.fileName;
         const index = fileName.lastIndexOf('.');
         if (index > 0) {
@@ -71,6 +71,12 @@ class BaseUri {
             ? this.lastExtension === ext
             : this.lastExtension.toLowerCase() === ext.toLowerCase();
     }
+    containsExtension(ext) {
+        const fileName = this.fileName;
+        // Use a regex so we keep the . on the front of the extension.
+        const extensions = fileName.split(/(?=\.)/g);
+        return extensions.some((e) => (this.isCaseSensitive ? e === ext : e.toLowerCase() === ext.toLowerCase()));
+    }
     getRootPathLength() {
         return this.getRootPath().length;
     }

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

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

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

@@ -9,6 +9,8 @@ export declare class EmptyUri extends BaseUri {
     get lastExtension(): string;
     get root(): Uri;
     get isCaseSensitive(): boolean;
+    get fragment(): string;
+    static isEmptyUri(uri: any): boolean;
     isEmpty(): boolean;
     isLocal(): boolean;
     getPath(): string;
@@ -26,6 +28,7 @@ export declare class EmptyUri extends BaseUri {
     combinePaths(...paths: string[]): Uri;
     getShortenedFileName(maxDirLength: number): string;
     stripExtension(): Uri;
+    withFragment(fragment: string): Uri;
     protected getPathComponentsImpl(): string[];
     protected getRootPath(): string;
     protected getComparablePath(): string;

package/dist/common/uri/emptyUri.js

@@ -32,6 +32,12 @@ class EmptyUri extends baseUri_1.BaseUri {
     get isCaseSensitive() {
         return true;
     }
+    get fragment() {
+        return '';
+    }
+    static isEmptyUri(uri) {
+        return (uri === null || uri === void 0 ? void 0 : uri._key) === EmptyKey;
+    }
     isEmpty() {
         return true;
     }
@@ -83,6 +89,9 @@ class EmptyUri extends baseUri_1.BaseUri {
     stripExtension() {
         return this;
     }
+    withFragment(fragment) {
+        return this;
+    }
     getPathComponentsImpl() {
         return [];
     }

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

@@ -1 +1 @@
-{"version":3,"file":"emptyUri.js","sourceRoot":"","sources":["../../../../src/common/uri/emptyUri.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,uCAAoC;AAGpC,MAAM,QAAQ,GAAG,SAAS,CAAC;AAE3B,MAAa,QAAS,SAAQ,iBAAO;IAEjC;QACI,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,QAAQ;QACf,OAAO,QAAQ,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED,IAAa,MAAM;QACf,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAa,QAAQ;QACjB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAa,aAAa;QACtB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAa,IAAI;QACb,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,OAAO;QACZ,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,OAAO;QACZ,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,OAAO;QACZ,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,WAAW;QAChB,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,QAAQ;QACb,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,mBAAmB;QACxB,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,YAAY,CAAC,KAAa;QAC/B,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,gBAAgB,CAAC,GAAW;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACQ,OAAO,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,YAAY;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,MAAM;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,OAAO,CAAC,MAAW;QACxB,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAsB;QACtC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,aAAa;QAClB,OAAO,CAAC,CAAC;IACb,CAAC;IAEQ,YAAY,CAAC,GAAG,KAAe;QACpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,oBAAoB,CAAC,YAAoB;QAC9C,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,cAAc;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEkB,qBAAqB;QACpC,OAAO,EAAE,CAAC;IACd,CAAC;IAEkB,WAAW;QAC1B,OAAO,EAAE,CAAC;IACd,CAAC;IAEkB,iBAAiB;QAChC,OAAO,EAAE,CAAC;IACd,CAAC;;AA3GL,4BA4GC;AA3GkB,kBAAS,GAAG,IAAI,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"emptyUri.js","sourceRoot":"","sources":["../../../../src/common/uri/emptyUri.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,uCAAoC;AAGpC,MAAM,QAAQ,GAAG,SAAS,CAAC;AAE3B,MAAa,QAAS,SAAQ,iBAAO;IAEjC;QACI,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,QAAQ;QACf,OAAO,QAAQ,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED,IAAa,MAAM;QACf,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAa,QAAQ;QACjB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAa,aAAa;QACtB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAa,IAAI;QACb,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,GAAQ;QACtB,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,QAAQ,CAAC;IAClC,CAAC;IAEQ,OAAO;QACZ,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,OAAO;QACZ,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,OAAO;QACZ,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,WAAW;QAChB,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,QAAQ;QACb,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,mBAAmB;QACxB,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,YAAY,CAAC,KAAa;QAC/B,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,gBAAgB,CAAC,GAAW;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACQ,OAAO,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,YAAY;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,MAAM;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,OAAO,CAAC,MAAW;QACxB,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAsB;QACtC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,aAAa;QAClB,OAAO,CAAC,CAAC;IACb,CAAC;IAEQ,YAAY,CAAC,GAAG,KAAe;QACpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEQ,oBAAoB,CAAC,YAAoB;QAC9C,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,cAAc;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEkB,qBAAqB;QACpC,OAAO,EAAE,CAAC;IACd,CAAC;IAEkB,WAAW;QAC1B,OAAO,EAAE,CAAC;IACd,CAAC;IAEkB,iBAAiB;QAChC,OAAO,EAAE,CAAC;IACd,CAAC;;AAvHL,4BAwHC;AAvHkB,kBAAS,GAAG,IAAI,QAAQ,EAAE,CAAC"}

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

@@ -9,6 +9,7 @@ export declare class FileUri extends BaseUri {
     private _formattedString;
     private constructor();
     get scheme(): string;
+    get fragment(): string;
     get fileName(): string;
     get lastExtension(): string;
     get root(): Uri;
@@ -29,6 +30,7 @@ export declare class FileUri extends BaseUri {
     getFilePath(): string;
     combinePaths(...paths: string[]): Uri;
     getDirectory(): Uri;
+    withFragment(fragment: string): Uri;
     protected getPathComponentsImpl(): string[];
     protected getRootPath(): string;
     protected getComparablePath(): string;

package/dist/common/uri/fileUri.js

@@ -30,6 +30,9 @@ class FileUri extends baseUri_1.BaseUri {
     get scheme() {
         return 'file';
     }
+    get fragment() {
+        return this._fragment;
+    }
     get fileName() {
         return (0, pathUtils_1.getFileName)(this._filePath);
     }
@@ -142,6 +145,9 @@ class FileUri extends baseUri_1.BaseUri {
             return this;
         }
     }
+    withFragment(fragment) {
+        return FileUri.createFileUri(this._filePath, this._query, fragment, undefined, this._isCaseSensitive);
+    }
     getPathComponentsImpl() {
         const components = (0, pathUtils_1.getPathComponents)(this._filePath);
         // Remove the first one if it's empty. The new algorithm doesn't

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

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

package/dist/common/uri/memoization.js

@@ -54,7 +54,7 @@ function cacheStaticFunc() {
     return function cacheStaticFunc_Fast(target, functionName, descriptor) {
         const originalMethod = descriptor.value;
         descriptor.value = function (...args) {
-            const key = `${functionName}+${args.map((a) => a === null || a === void 0 ? void 0 : a.toString()).join(',')}`;
+            const key = `${functionName}+${args === null || args === void 0 ? void 0 : args.map((a) => a === null || a === void 0 ? void 0 : a.toString()).join(',')}`;
             let cachedResult;
             if (!staticCache.has(key)) {
                 cachedResult = originalMethod.apply(this, args);

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

@@ -1 +1 @@
-{"version":3,"file":"memoization.js","sourceRoot":"","sources":["../../../../src/common/uri/memoization.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,mCAAmC;AACnC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAe,CAAC;AAE3C,2CAA2C;AAC3C,SAAgB,aAAa;IACzB,OAAO,UAAU,MAAW,EAAE,YAAoB,EAAE,UAA8B;QAC9E,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC;QACtC,UAAU,CAAC,GAAG,GAAG,UAAqB,GAAG,IAAS;YAC9C,4CAA4C;YAC5C,MAAM,MAAM,GAAG,cAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEjD,+EAA+E;YAC/E,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE;gBACtC,GAAG;oBACC,OAAO,MAAM,CAAC;gBAClB,CAAC;aACJ,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;QACF,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AAjBD,sCAiBC;AAED,mDAAmD;AACnD,8EAA8E;AAC9E,SAAgB,qBAAqB;IACjC,OAAO,UAAU,MAAW,EAAE,YAAoB,EAAE,UAA8B;QAC9E,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QACxC,UAAU,CAAC,KAAK,GAAG,UAAqB,GAAG,IAAS;YAChD,4CAA4C;YAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEhD,+EAA+E;YAC/E,IAAI,CAAC,YAAY,CAAC,GAAG,GAAG,EAAE;gBACtB,mFAAmF;gBACnF,yDAAyD;gBACzD,OAAO,MAAM,CAAC;YAClB,CAAC,CAAC;YACF,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;QACF,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AAjBD,sDAiBC;AAED,8DAA8D;AAC9D,SAAgB,eAAe;IAC3B,OAAO,SAAS,oBAAoB,CAAC,MAAW,EAAE,YAAoB,EAAE,UAA8B;QAClG,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QACxC,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAS;YACrC,MAAM,GAAG,GAAG,GAAG,YAAY,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/E,IAAI,YAAiB,CAAC;YACtB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACvB,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAChD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;aACtC;iBAAM;gBACH,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACvC;YACD,OAAO,YAAY,CAAC;QACxB,CAAC,CAAC;QACF,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AAhBD,0CAgBC"}
+{"version":3,"file":"memoization.js","sourceRoot":"","sources":["../../../../src/common/uri/memoization.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,mCAAmC;AACnC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAe,CAAC;AAE3C,2CAA2C;AAC3C,SAAgB,aAAa;IACzB,OAAO,UAAU,MAAW,EAAE,YAAoB,EAAE,UAA8B;QAC9E,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC;QACtC,UAAU,CAAC,GAAG,GAAG,UAAqB,GAAG,IAAS;YAC9C,4CAA4C;YAC5C,MAAM,MAAM,GAAG,cAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEjD,+EAA+E;YAC/E,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE;gBACtC,GAAG;oBACC,OAAO,MAAM,CAAC;gBAClB,CAAC;aACJ,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;QACF,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AAjBD,sCAiBC;AAED,mDAAmD;AACnD,8EAA8E;AAC9E,SAAgB,qBAAqB;IACjC,OAAO,UAAU,MAAW,EAAE,YAAoB,EAAE,UAA8B;QAC9E,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QACxC,UAAU,CAAC,KAAK,GAAG,UAAqB,GAAG,IAAS;YAChD,4CAA4C;YAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEhD,+EAA+E;YAC/E,IAAI,CAAC,YAAY,CAAC,GAAG,GAAG,EAAE;gBACtB,mFAAmF;gBACnF,yDAAyD;gBACzD,OAAO,MAAM,CAAC;YAClB,CAAC,CAAC;YACF,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;QACF,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AAjBD,sDAiBC;AAED,8DAA8D;AAC9D,SAAgB,eAAe;IAC3B,OAAO,SAAS,oBAAoB,CAAC,MAAW,EAAE,YAAoB,EAAE,UAA8B;QAClG,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QACxC,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAS;YACrC,MAAM,GAAG,GAAG,GAAG,YAAY,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAChF,IAAI,YAAiB,CAAC;YACtB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACvB,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAChD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;aACtC;iBAAM;gBACH,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACvC;YACD,OAAO,YAAY,CAAC;QACxB,CAAC,CAAC;QACF,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AAhBD,0CAgBC"}

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

@@ -9,8 +9,9 @@ export interface Uri {
     readonly initPyUri: Uri;
     readonly initPyiUri: Uri;
     readonly pytypedUri: Uri;
-    readonly fileNameWithoutExtension: string;
+    readonly fileNameWithoutExtensions: string;
     readonly isCaseSensitive: boolean;
+    readonly fragment: string;
     isEmpty(): boolean;
     toString(): string;
     toUserVisibleString(): string;
@@ -40,6 +41,8 @@ export interface Uri {
     replaceExtension(ext: string): Uri;
     addExtension(ext: string): Uri;
     hasExtension(ext: string): boolean;
+    containsExtension(ext: string): boolean;
+    withFragment(fragment: string): Uri;
 }
 export declare namespace Uri {
     function file(path: string, isCaseSensitive?: boolean, checkRelative?: boolean): Uri;

package/dist/common/uri/uri.js

@@ -33,7 +33,7 @@ function getFilePath(uri) {
     }
     // vscode.URI normalizes the path to use the correct path separators.
     // We need to do the same.
-    if (process.platform === 'win32') {
+    if ((process === null || process === void 0 ? void 0 : process.platform) === 'win32') {
         filePath = filePath.replace(/\//g, '\\');
     }
     return filePath;
@@ -52,7 +52,7 @@ function normalizeUri(uri) {
     }
     // Original URI may not have resolved all the `..` in the path, so remove them.
     // Note: this also has the effect of removing any trailing slashes.
-    const finalURI = vscode_uri_1.Utils.resolvePath(parsed);
+    const finalURI = parsed.path.length > 0 ? vscode_uri_1.Utils.resolvePath(parsed) : parsed;
     const finalString = finalURI.path.length !== parsed.path.length ? finalURI.toString() : originalString;
     return { uri: finalURI, str: finalString };
 }
@@ -79,6 +79,9 @@ var Uri;
         if (webUri_1.WebUri.isWebUri(jsonObj)) {
             return webUri_1.WebUri.fromJsonObj(jsonObj);
         }
+        if (emptyUri_1.EmptyUri.isEmptyUri(jsonObj)) {
+            return emptyUri_1.EmptyUri.instance;
+        }
         return jsonObj;
     }
     Uri.fromJsonObj = fromJsonObj;

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

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

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

@@ -35,5 +35,7 @@ export declare function hasPythonExtension(uri: Uri): boolean;
 export declare function getFileSpec(root: Uri, fileSpec: string): FileSpec;
 export declare function isFileSystemCaseSensitive(fs: FileSystem, tmp: TempFile | undefined): boolean;
 export declare function isFileSystemCaseSensitiveInternal(fs: FileSystem, tmp: TempFile): boolean;
+export declare function getDirectoryChangeKind(fs: ReadOnlyFileSystem, oldDirectory: Uri, newDirectory: Uri): 'Same' | 'Renamed' | 'Moved';
 export declare function deduplicateFolders(listOfFolders: Uri[][]): Uri[];
 export declare function getRootUri(isCaseSensitive: boolean): Uri | undefined;
+export declare function encodeUri(fs: ReadOnlyFileSystem, uri: Uri): string;

package/dist/common/uri/uriUtils.js

@@ -7,7 +7,7 @@
  * Utility functions for manipulating URIs.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRootUri = exports.deduplicateFolders = exports.isFileSystemCaseSensitiveInternal = exports.isFileSystemCaseSensitive = exports.getFileSpec = exports.hasPythonExtension = exports.getWildcardRoot = exports.getWildcardRegexPattern = exports.setTestingMode = exports.getFileSystemEntriesFromDirEntries = exports.getFileSystemEntries = exports.tryRealpath = exports.tryStat = exports.isFile = exports.isDirectory = exports.directoryExists = exports.fileExists = exports.getFileSize = exports.makeDirectories = exports.forEachAncestorDirectory = exports.FileSpec = void 0;
+exports.encodeUri = exports.getRootUri = exports.deduplicateFolders = exports.getDirectoryChangeKind = exports.isFileSystemCaseSensitiveInternal = exports.isFileSystemCaseSensitive = exports.getFileSpec = exports.hasPythonExtension = exports.getWildcardRoot = exports.getWildcardRegexPattern = exports.setTestingMode = exports.getFileSystemEntriesFromDirEntries = exports.getFileSystemEntries = exports.tryRealpath = exports.tryStat = exports.isFile = exports.isDirectory = exports.directoryExists = exports.fileExists = exports.getFileSize = exports.makeDirectories = exports.forEachAncestorDirectory = exports.FileSpec = void 0;
 const crypto_1 = require("../crypto");
 const pathUtils_1 = require("../pathUtils");
 const uri_1 = require("./uri");
@@ -324,6 +324,18 @@ function isFileSystemCaseSensitiveInternal(fs, tmp) {
     }
 }
 exports.isFileSystemCaseSensitiveInternal = isFileSystemCaseSensitiveInternal;
+function getDirectoryChangeKind(fs, oldDirectory, newDirectory) {
+    if (oldDirectory.equals(newDirectory)) {
+        return 'Same';
+    }
+    const relativePaths = oldDirectory.getRelativePathComponents(newDirectory);
+    // 2 means only last folder name has changed.
+    if (relativePaths.length === 2 && relativePaths[0] === '..' && relativePaths[1] !== '..') {
+        return 'Renamed';
+    }
+    return 'Moved';
+}
+exports.getDirectoryChangeKind = getDirectoryChangeKind;
 function deduplicateFolders(listOfFolders) {
     const foldersToWatch = new Map();
     listOfFolders.forEach((folders) => {
@@ -359,4 +371,9 @@ function getRootUri(isCaseSensitive) {
     return undefined;
 }
 exports.getRootUri = getRootUri;
+function encodeUri(fs, uri) {
+    // Convert to a URI string that the LSP client understands (mapped files are only local to the server).
+    return fs.getOriginalUri(uri).toString();
+}
+exports.encodeUri = encodeUri;
 //# sourceMappingURL=uriUtils.js.map

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

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

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

@@ -10,6 +10,7 @@ export declare class WebUri extends BaseUri {
     private constructor();
     get scheme(): string;
     get isCaseSensitive(): boolean;
+    get fragment(): string;
     get root(): Uri;
     get fileName(): string;
     get lastExtension(): string;
@@ -29,6 +30,7 @@ export declare class WebUri extends BaseUri {
     getFilePath(): string;
     combinePaths(...paths: string[]): Uri;
     getDirectory(): Uri;
+    withFragment(fragment: string): Uri;
     protected getPathComponentsImpl(): string[];
     protected getRootPath(): string;
     protected getComparablePath(): string;

package/dist/common/uri/webUri.js

@@ -39,6 +39,9 @@ class WebUri extends baseUri_1.BaseUri {
         // Web URIs are always case sensitive
         return true;
     }
+    get fragment() {
+        return this._fragment;
+    }
     get root() {
         const rootPath = this.getRootPath();
         if (rootPath !== this._path) {
@@ -124,7 +127,7 @@ class WebUri extends baseUri_1.BaseUri {
         return this._path;
     }
     getFilePath() {
-        return '';
+        return ''; // Web URIs don't have file paths so this is always empty.
     }
     combinePaths(...paths) {
         // Resolve and combine paths, never want URIs with '..' in the middle.
@@ -147,6 +150,9 @@ class WebUri extends baseUri_1.BaseUri {
             return this;
         }
     }
+    withFragment(fragment) {
+        return WebUri.createWebUri(this._scheme, this._authority, this._path, this._query, fragment, undefined);
+    }
     getPathComponentsImpl() {
         // Get the root path and the rest of the path components.
         const rootPath = this.getRootPath();

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

@@ -1 +1 @@
-{"version":3,"file":"webUri.js","sourceRoot":"","sources":["../../../../src/common/uri/webUri.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webUri.js","sourceRoot":"","sources":["../../../../src/common/uri/webUri.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;;;;;;;AAEH,4CAA4G;AAC5G,uCAAoC;AACpC,+CAAsF;AAGtF,MAAa,MAAO,SAAQ,iBAAO;IAC/B,YACI,GAAW,EACM,OAAe,EACf,UAAkB,EAClB,KAAa,EACb,MAAc,EACd,SAAiB,EACjB,eAAmC;QAEpD,KAAK,CAAC,GAAG,CAAC,CAAC;QAPM,YAAO,GAAP,OAAO,CAAQ;QACf,eAAU,GAAV,UAAU,CAAQ;QAClB,UAAK,GAAL,KAAK,CAAQ;QACb,WAAM,GAAN,MAAM,CAAQ;QACd,cAAS,GAAT,SAAS,CAAQ;QACjB,oBAAe,GAAf,eAAe,CAAoB;IAGxD,CAAC;IAED,IAAa,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,eAAe;QACf,qCAAqC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAGD,IAAa,IAAI;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,QAAQ,KAAK,IAAI,CAAC,KAAK,EAAE;YACzB,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;SAC1F;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,IAAa,QAAQ;QACjB,0EAA0E;QAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC;IAGD,IAAa,aAAa;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,KAAK,IAAI,CAAC,EAAE;YACZ,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAGM,AAAP,MAAM,CAAC,YAAY,CACf,MAAc,EACd,SAAiB,EACjB,IAAY,EACZ,KAAa,EACb,QAAgB,EAChB,cAAkC;QAElC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxE,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IACrF,CAAC;IAEQ,QAAQ;QACb,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACvB,OAAO,GAAG,IAAI,CAAC,OAAO,MAAM,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAC3F,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAC5C,EAAE,CAAC;SACN;QACD,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IACQ,mBAAmB;QACxB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,GAAQ;QACpB,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,MAAK,SAAS,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,SAAS,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,GAAW;QAC1B,OAAO,MAAM,CAAC,YAAY,CACtB,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,UAAU,EACd,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,eAAe,CACtB,CAAC;IACN,CAAC;IAEQ,YAAY,CAAC,KAAa;QAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAEQ,OAAO,CAAC,KAAa;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnC,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC/G,CAAC;IAEQ,MAAM;QACX,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IACtE,CAAC;IAEQ,OAAO,CAAC,MAAW;QACxB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC1B,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC9E,CAAC;IAEQ,OAAO;QACZ,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAsB;QACtC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,EAAE,EAAE;YACpC,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;YAC9B,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;YACzC,oFAAoF;YACpF,yCAAyC;YACzC,MAAM,SAAS,GACX,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAA,yCAA6B,EAAC,KAAK,CAAC,KAAK,CAAC;gBACjF,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,GAAG;gBACnB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YAEtB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SAC3C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IACQ,aAAa;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC7B,CAAC;IAEQ,OAAO;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAEQ,WAAW;QAChB,OAAO,EAAE,CAAC,CAAC,0DAA0D;IACzE,CAAC;IAEQ,YAAY,CAAC,GAAG,KAAe;QACpC,sEAAsE;QACtE,IAAI,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAA,wBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;QAEzE,oDAAoD;QACpD,IAAI,IAAA,yCAA6B,EAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAChE,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACrD;QACD,IAAI,QAAQ,KAAK,IAAI,CAAC,KAAK,EAAE;YACzB,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;SAC1F;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAGQ,YAAY;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,OAAO,MAAM,CAAC,YAAY,CACtB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAC1B,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,EACd,SAAS,CACZ,CAAC;SACL;aAAM;YACH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;IAED,YAAY,CAAC,QAAgB;QACzB,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC5G,CAAC;IAEkB,qBAAqB;QACpC,yDAAyD;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC1E,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CACnC,CAAC;IACN,CAAC;IAEkB,WAAW;QAC1B,MAAM,UAAU,GAAG,IAAA,yBAAa,EAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEkB,iBAAiB;QAChC,OAAO,IAAA,4BAAgB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,MAAc,EAAE,SAAiB,EAAE,IAAY,EAAE,KAAa,EAAE,QAAgB;QACtG,OAAO,GAAG,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACzG,CAAC;CACJ;AA/MD,wBA+MC;AApLG;IADC,IAAA,2BAAa,GAAE;kCAOf;AAGD;IADC,IAAA,2BAAa,GAAE;sCAKf;AAGD;IADC,IAAA,2BAAa,GAAE;2CAQf;AAoHQ;IADR,IAAA,mCAAqB,GAAE;0CAevB;AA/HM;IADN,IAAA,6BAAe,GAAE;gCAWjB"}

package/dist/common/workspaceEditUtils.d.ts

@@ -2,18 +2,19 @@ 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(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: {
+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: {
     [id: string]: ChangeAnnotation;
 }, defaultAnnotationId: string): WorkspaceEdit;
-export declare function appendToWorkspaceEdit(edits: FileEditAction[], workspaceEdit: WorkspaceEdit): void;
+export declare function appendToWorkspaceEdit(fs: ReadOnlyFileSystem, 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: Map<string, Uri>): void;
 export declare function applyDocumentChanges(program: EditableProgram, fileInfo: SourceFileInfo, edits: TextEdit[]): void;
-export declare function generateWorkspaceEdit(originalService: AnalyzerService, clonedService: AnalyzerService, filesChanged: Map<string, Uri>): WorkspaceEdit;
+export declare function generateWorkspaceEdit(fs: ReadOnlyFileSystem, originalService: AnalyzerService, clonedService: AnalyzerService, filesChanged: Map<string, Uri>): WorkspaceEdit;

package/dist/common/workspaceEditUtils.js

@@ -16,6 +16,7 @@ const debug_1 = require("./debug");
 const positionUtils_1 = require("./positionUtils");
 const textRange_1 = require("./textRange");
 const uri_1 = require("./uri/uri");
+const uriUtils_1 = require("./uri/uriUtils");
 function convertToTextEdits(editActions) {
     return editActions.map((editAction) => ({
         range: editAction.range,
@@ -27,18 +28,18 @@ function convertToFileTextEdits(fileUri, editActions) {
     return editActions.map((a) => ({ fileUri, ...a }));
 }
 exports.convertToFileTextEdits = convertToFileTextEdits;
-function convertToWorkspaceEdit(edits, changeAnnotations, defaultAnnotationId = 'default') {
+function convertToWorkspaceEdit(fs, edits, changeAnnotations, defaultAnnotationId = 'default') {
     if ((0, core_1.isArray)(edits)) {
-        return _convertToWorkspaceEditWithChanges(edits);
+        return _convertToWorkspaceEditWithChanges(fs, edits);
     }
-    return _convertToWorkspaceEditWithDocumentChanges(edits, changeAnnotations, defaultAnnotationId);
+    return _convertToWorkspaceEditWithDocumentChanges(fs, edits, changeAnnotations, defaultAnnotationId);
 }
 exports.convertToWorkspaceEdit = convertToWorkspaceEdit;
-function appendToWorkspaceEdit(edits, workspaceEdit) {
+function appendToWorkspaceEdit(fs, edits, workspaceEdit) {
     edits.forEach((edit) => {
-        const uri = edit.fileUri;
-        workspaceEdit.changes[uri.toString()] = workspaceEdit.changes[uri.toString()] || [];
-        workspaceEdit.changes[uri.toString()].push({ range: edit.range, newText: edit.replacementText });
+        const uri = (0, uriUtils_1.encodeUri)(fs, edit.fileUri);
+        workspaceEdit.changes[uri] = workspaceEdit.changes[uri] || [];
+        workspaceEdit.changes[uri].push({ range: edit.range, newText: edit.replacementText });
     });
 }
 exports.appendToWorkspaceEdit = appendToWorkspaceEdit;
@@ -119,7 +120,7 @@ function applyDocumentChanges(program, fileInfo, edits) {
     });
 }
 exports.applyDocumentChanges = applyDocumentChanges;
-function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
+function generateWorkspaceEdit(fs, originalService, clonedService, filesChanged) {
     var _a;
     // For now, we won't do text diff to find out minimal text changes. instead, we will
     // consider whole text of the files are changed. In future, we could consider
@@ -137,7 +138,7 @@ function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
         if (!parseResults) {
             continue;
         }
-        edits.changes[uri.toString()] = [
+        edits.changes[(0, uriUtils_1.encodeUri)(fs, uri)] = [
             {
                 range: (0, positionUtils_1.convertTextRangeToRange)(parseResults.parseTree, parseResults.tokenizerOutput.lines),
                 newText: (_a = final.getFileContent()) !== null && _a !== void 0 ? _a : '',
@@ -147,14 +148,14 @@ function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
     return edits;
 }
 exports.generateWorkspaceEdit = generateWorkspaceEdit;
-function _convertToWorkspaceEditWithChanges(edits) {
+function _convertToWorkspaceEditWithChanges(fs, edits) {
     const workspaceEdit = {
         changes: {},
     };
-    appendToWorkspaceEdit(edits, workspaceEdit);
+    appendToWorkspaceEdit(fs, edits, workspaceEdit);
     return workspaceEdit;
 }
-function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotations, defaultAnnotationId = 'default') {
+function _convertToWorkspaceEditWithDocumentChanges(fs, editActions, changeAnnotations, defaultAnnotationId = 'default') {
     const workspaceEdit = {
         documentChanges: [],
         changeAnnotations: changeAnnotations,
@@ -164,7 +165,7 @@ function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotatio
     for (const operation of editActions.fileOperations) {
         switch (operation.kind) {
             case 'create':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create(operation.fileUri.toString(), /* options */ undefined, defaultAnnotationId));
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create((0, uriUtils_1.encodeUri)(fs, operation.fileUri), /* options */ undefined, defaultAnnotationId));
                 break;
             case 'rename':
             case 'delete':
@@ -174,9 +175,9 @@ function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotatio
         }
     }
     // 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.fileUri.toString());
+    const mapPerFile = (0, collectionUtils_1.createMapFromItems)(editActions.edits, (e) => (0, uriUtils_1.encodeUri)(fs, e.fileUri));
     for (const [uri, value] of mapPerFile) {
-        workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri, version: null }, Array.from(value.map((v) => ({
+        workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri: uri, version: null }, Array.from(value.map((v) => ({
             range: v.range,
             newText: v.replacementText,
             annotationId: defaultAnnotationId,
@@ -187,11 +188,11 @@ function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotatio
             case 'create':
                 break;
             case 'rename':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create(operation.oldFileUri.toString(), operation.newFileUri.toString(), 
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create((0, uriUtils_1.encodeUri)(fs, operation.oldFileUri), (0, uriUtils_1.encodeUri)(fs, operation.newFileUri), 
                 /* options */ undefined, defaultAnnotationId));
                 break;
             case 'delete':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create(operation.fileUri.toString(), /* options */ undefined, defaultAnnotationId));
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create((0, uriUtils_1.encodeUri)(fs, operation.fileUri), /* options */ undefined, defaultAnnotationId));
                 break;
             default:
                 (0, debug_1.assertNever)(operation);