@codingame/monaco-vscode-files-service-override 2.0.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/vscode/src/vs/platform/files/common/fileService.js

@@ -347,7 +347,7 @@ let FileService = class FileService extends Disposable {
     }
     async doReadFileAtomic(provider, resource, options, token) {
         return ( new Promise((resolve, reject) => {
-            this.writeQueue.queueFor(resource, this.getExtUri(provider).providerExtUri).queue(async () => {
+            this.writeQueue.queueFor(resource, async () => {
                 try {
                     const content = await this.doReadFile(provider, resource, options, token);
                     resolve(content);
@@ -355,7 +355,7 @@ let FileService = class FileService extends Disposable {
                 catch (error) {
                     reject(error);
                 }
-            });
+            }, this.getExtUri(provider).providerExtUri);
         }));
     }
     async doReadFile(provider, resource, options, token) {
@@ -740,11 +740,10 @@ let FileService = class FileService extends Disposable {
             return sourceProvider.cloneFile(source, target);
         }
         await this.mkdirp(targetProvider, this.getExtUri(targetProvider).providerExtUri.dirname(target));
-        const sourceWriteQueue = this.writeQueue.queueFor(source, this.getExtUri(sourceProvider).providerExtUri);
         if (sourceProvider === targetProvider && hasFileFolderCopyCapability(sourceProvider)) {
-            return sourceWriteQueue.queue(() => sourceProvider.copy(source, target, { overwrite: true }));
+            return this.writeQueue.queueFor(source, () => sourceProvider.copy(source, target, { overwrite: true }), this.getExtUri(sourceProvider).providerExtUri);
         }
-        return sourceWriteQueue.queue(() => this.doCopyFile(sourceProvider, source, targetProvider, target));
+        return this.writeQueue.queueFor(source, () => this.doCopyFile(sourceProvider, source, targetProvider, target), this.getExtUri(sourceProvider).providerExtUri);
     }
     static { this.WATCHER_CORRELATION_IDS = 0; }
     createWatcher(resource, options) {
@@ -818,7 +817,7 @@ let FileService = class FileService extends Disposable {
         this.activeWatchers.clear();
     }
     async doWriteBuffered(provider, resource, options, readableOrStreamOrBufferedStream) {
-        return this.writeQueue.queueFor(resource, this.getExtUri(provider).providerExtUri).queue(async () => {
+        return this.writeQueue.queueFor(resource, async () => {
             const handle = await provider.open(resource, { create: true, unlock: options?.unlock ?? false });
             try {
                 if (isReadableStream(readableOrStreamOrBufferedStream) || isReadableBufferedStream(readableOrStreamOrBufferedStream)) {
@@ -834,7 +833,7 @@ let FileService = class FileService extends Disposable {
             finally {
                 await provider.close(handle);
             }
-        });
+        }, this.getExtUri(provider).providerExtUri);
     }
     async doWriteStreamBufferedQueued(provider, handle, streamOrBufferedStream) {
         let posInFile = 0;
@@ -887,7 +886,7 @@ let FileService = class FileService extends Disposable {
         }
     }
     async doWriteUnbuffered(provider, resource, options, bufferOrReadableOrStreamOrBufferedStream) {
-        return this.writeQueue.queueFor(resource, this.getExtUri(provider).providerExtUri).queue(() => this.doWriteUnbufferedQueued(provider, resource, options, bufferOrReadableOrStreamOrBufferedStream));
+        return this.writeQueue.queueFor(resource, () => this.doWriteUnbufferedQueued(provider, resource, options, bufferOrReadableOrStreamOrBufferedStream), this.getExtUri(provider).providerExtUri);
     }
     async doWriteUnbufferedQueued(provider, resource, options, bufferOrReadableOrStreamOrBufferedStream) {
         let buffer;
@@ -906,7 +905,7 @@ let FileService = class FileService extends Disposable {
         await provider.writeFile(resource, buffer.buffer, { create: true, overwrite: true, unlock: options?.unlock ?? false, atomic: options?.atomic ?? false });
     }
     async doPipeBuffered(sourceProvider, source, targetProvider, target) {
-        return this.writeQueue.queueFor(target, this.getExtUri(targetProvider).providerExtUri).queue(() => this.doPipeBufferedQueued(sourceProvider, source, targetProvider, target));
+        return this.writeQueue.queueFor(target, () => this.doPipeBufferedQueued(sourceProvider, source, targetProvider, target), this.getExtUri(targetProvider).providerExtUri);
     }
     async doPipeBufferedQueued(sourceProvider, source, targetProvider, target) {
         let sourceHandle = undefined;
@@ -939,13 +938,13 @@ let FileService = class FileService extends Disposable {
         }
     }
     async doPipeUnbuffered(sourceProvider, source, targetProvider, target) {
-        return this.writeQueue.queueFor(target, this.getExtUri(targetProvider).providerExtUri).queue(() => this.doPipeUnbufferedQueued(sourceProvider, source, targetProvider, target));
+        return this.writeQueue.queueFor(target, () => this.doPipeUnbufferedQueued(sourceProvider, source, targetProvider, target), this.getExtUri(targetProvider).providerExtUri);
     }
     async doPipeUnbufferedQueued(sourceProvider, source, targetProvider, target) {
         return targetProvider.writeFile(target, await sourceProvider.readFile(source), { create: true, overwrite: true, unlock: false, atomic: false });
     }
     async doPipeUnbufferedToBuffered(sourceProvider, source, targetProvider, target) {
-        return this.writeQueue.queueFor(target, this.getExtUri(targetProvider).providerExtUri).queue(() => this.doPipeUnbufferedToBufferedQueued(sourceProvider, source, targetProvider, target));
+        return this.writeQueue.queueFor(target, () => this.doPipeUnbufferedToBufferedQueued(sourceProvider, source, targetProvider, target), this.getExtUri(targetProvider).providerExtUri);
     }
     async doPipeUnbufferedToBufferedQueued(sourceProvider, source, targetProvider, target) {
         const targetHandle = await targetProvider.open(target, { create: true, unlock: false });

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.js

@@ -110,9 +110,9 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         }
     }
     queueModelReload(model) {
-        const queue = this.modelResolveQueue.queueFor(model.resource);
-        if (queue.size <= 1) {
-            queue.queue(async () => {
+        const queueSize = this.modelResolveQueue.queueSize(model.resource);
+        if (queueSize <= 1) {
+            this.modelResolveQueue.queueFor(model.resource, async () => {
                 try {
                     await this.reload(model);
                 }