@codingame/monaco-vscode-files-service-override 5.1.0 → 5.1.2-segmenter.1

package/files.js

@@ -110,16 +110,19 @@ class RegisteredFileSystemProvider extends Disposable {
             this.capabilities |= 2048 ;
         }
     }
+    formatUri(uri) {
+        return ( uri.with({ query: null, fragment: null }).toString(true));
+    }
     registerFile(file) {
-        this.files.set(( file.uri.toString()), file);
+        this.files.set(this.formatUri(file.uri), file);
         this._onDidChangeFile.fire([{
                 resource: file.uri,
                 type: 1
             }]);
         const disposableStore = new DisposableStore();
         disposableStore.add(toDisposable(() => {
-            if (this.files.get(( file.uri.toString())) === file) {
-                this.files.delete(( file.uri.toString()));
+            if (this.files.get(this.formatUri(file.uri)) === file) {
+                this.files.delete(this.formatUri(file.uri));
                 this._onDidChangeFile.fire([{
                         resource: file.uri,
                         type: 2
@@ -136,9 +139,9 @@ class RegisteredFileSystemProvider extends Disposable {
                 }]);
         }));
         disposableStore.add(file.onDidRename(({ from, to }) => {
-            if (this.files.get(( from.toString())) === file) {
-                this.files.delete(( from.toString()));
-                this.files.set(( to.toString()), file);
+            if (this.files.get(this.formatUri(from)) === file) {
+                this.files.delete(this.formatUri(from));
+                this.files.set(this.formatUri(to), file);
                 this._onDidChangeFile.fire([{
                         resource: from,
                         type: 2
@@ -151,7 +154,7 @@ class RegisteredFileSystemProvider extends Disposable {
         return disposableStore;
     }
     async stat(resource) {
-        const resourceUri = ( resource.toString());
+        const resourceUri = this.formatUri(resource);
         const file = this.files.get(resourceUri);
         if (file != null) {
             return file.stats();
@@ -172,7 +175,7 @@ class RegisteredFileSystemProvider extends Disposable {
     async readdir(resource) {
         const includedPaths = ( ( Array.from(( this.files.keys()))
             .map(uri => ( URI.parse(uri))))
-            .filter(uri => uri.path.startsWith(resource.path + '/'))
+            .filter(uri => uri.authority === resource.authority && uri.path.startsWith(resource.path + '/'))
             .map(uri => extUri.relativePath(resource, uri)));
         const files = includedPaths.filter(path => !path.includes('/'));
         const directories = ( includedPaths.filter(path => path.includes('/')).map(path => path.slice(0, path.indexOf('/'))));
@@ -188,7 +191,7 @@ class RegisteredFileSystemProvider extends Disposable {
         ];
     }
     async readFile(resource) {
-        const file = this.files.get(( resource.toString()));
+        const file = this.files.get(this.formatUri(resource));
         if (file != null) {
             const data = await file.read();
             if (data instanceof Uint8Array) {
@@ -204,7 +207,7 @@ class RegisteredFileSystemProvider extends Disposable {
         return Disposable.None;
     }
     async writeFile(resource, content) {
-        const file = this.files.get(( resource.toString()));
+        const file = this.files.get(this.formatUri(resource));
         if (file?.write != null) {
             await file.write(decoder.decode(content));
             return;
@@ -212,7 +215,7 @@ class RegisteredFileSystemProvider extends Disposable {
         throw createFileSystemProviderError('Not allowed', FileSystemProviderErrorCode.NoPermissions);
     }
     async delete(resource) {
-        const file = this.files.get(( resource.toString()));
+        const file = this.files.get(this.formatUri(resource));
         if (file != null) {
             await file.delete();
             return;
@@ -220,7 +223,7 @@ class RegisteredFileSystemProvider extends Disposable {
         throw createFileSystemProviderError('File not found', FileSystemProviderErrorCode.FileNotFound);
     }
     async rename(from, to) {
-        const file = this.files.get(( from.toString()));
+        const file = this.files.get(this.formatUri(from));
         if (file != null) {
             await file.rename(to);
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "5.1.0",
+  "version": "5.1.2-segmenter.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.1.2-segmenter.1"
   }
 }