@codingame/monaco-vscode-files-service-override 1.83.16 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0"
   }
 }

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

@@ -18,7 +18,9 @@ import { readFileIntoStream } from './io.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { ErrorNoTelemetry } from 'monaco-editor/esm/vs/base/common/errors.js';
 
+var FileService_1;
 let FileService = class FileService extends Disposable {
+    static { FileService_1 = this; }
     constructor(logService) {
         super();
         this.logService = logService;
@@ -32,8 +34,9 @@ let FileService = class FileService extends Disposable {
         this.provider = ( new Map());
         this._onDidRunOperation = this._register(( new Emitter()));
         this.onDidRunOperation = this._onDidRunOperation.event;
-        this._onDidFilesChange = this._register(( new Emitter()));
-        this.onDidFilesChange = this._onDidFilesChange.event;
+        this.internalOnDidFilesChange = this._register(( new Emitter()));
+        this._onDidUncorrelatedFilesChange = this._register(( new Emitter()));
+        this.onDidFilesChange = this._onDidUncorrelatedFilesChange.event;
         this._onDidWatchError = this._register(( new Emitter()));
         this.onDidWatchError = this._onDidWatchError.event;
         this.activeWatchers = ( new Map());
@@ -47,7 +50,13 @@ let FileService = class FileService extends Disposable {
         const providerDisposables = ( new DisposableStore());
         this.provider.set(scheme, provider);
         this._onDidChangeFileSystemProviderRegistrations.fire({ added: true, scheme, provider });
-        providerDisposables.add(provider.onDidChangeFile(changes => this._onDidFilesChange.fire(( new FileChangesEvent(changes, !this.isPathCaseSensitive(provider))))));
+        providerDisposables.add(provider.onDidChangeFile(changes => {
+            const event = ( new FileChangesEvent(changes, !this.isPathCaseSensitive(provider)));
+            this.internalOnDidFilesChange.fire(event);
+            if (!event.hasCorrelation()) {
+                this._onDidUncorrelatedFilesChange.fire(event);
+            }
+        }));
         if (typeof provider.onDidWatchError === 'function') {
             providerDisposables.add(provider.onDidWatchError(error => this._onDidWatchError.fire(( new Error(error)))));
         }
@@ -737,6 +746,13 @@ let FileService = class FileService extends Disposable {
         }
         return sourceWriteQueue.queue(() => this.doCopyFile(sourceProvider, source, targetProvider, target));
     }
+    static { this.WATCHER_CORRELATION_IDS = 0; }
+    createWatcher(resource, options) {
+        return this.watch(resource, {
+            ...options,
+            correlationId: FileService_1.WATCHER_CORRELATION_IDS++
+        });
+    }
     watch(resource, options = { recursive: false, excludes: [] }) {
         const disposables = ( new DisposableStore());
         let watchDisposed = false;
@@ -756,6 +772,20 @@ let FileService = class FileService extends Disposable {
                 this.logService.error(error);
             }
         })();
+        const correlationId = options.correlationId;
+        if (typeof correlationId === 'number') {
+            const fileChangeEmitter = disposables.add(( new Emitter()));
+            disposables.add(this.internalOnDidFilesChange.event(e => {
+                if (e.correlates(correlationId)) {
+                    fileChangeEmitter.fire(e);
+                }
+            }));
+            const watcher = {
+                onDidChange: fileChangeEmitter.event,
+                dispose: () => disposables.dispose()
+            };
+            return watcher;
+        }
         return disposables;
     }
     async doWatch(resource, options) {
@@ -952,7 +982,7 @@ let FileService = class FileService extends Disposable {
         return ( resource.toString(true));
     }
 };
-FileService = ( __decorate([
+FileService = FileService_1 = ( __decorate([
     ( __param(0, ILogService))
 ], FileService));
 

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

@@ -1,5 +1,7 @@
+import { TernarySearchTree } from 'monaco-editor/esm/vs/base/common/ternarySearchTree.js';
 import { isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
 
 var FileType;
 ( (function(FileType) {
@@ -86,6 +88,111 @@ var FileChangeType;
     FileChangeType[FileChangeType["ADDED"] = 1] = "ADDED";
     FileChangeType[FileChangeType["DELETED"] = 2] = "DELETED";
 })(FileChangeType || (FileChangeType = {})));
+class FileChangesEvent {
+    static { this.MIXED_CORRELATION = null; }
+    constructor(changes, ignorePathCasing) {
+        this.ignorePathCasing = ignorePathCasing;
+        this.correlationId = undefined;
+        this.added = ( new Lazy(() => {
+            const added = TernarySearchTree.forUris(() => this.ignorePathCasing);
+            added.fill(( this.rawAdded.map(resource => [resource, true])));
+            return added;
+        }));
+        this.updated = ( new Lazy(() => {
+            const updated = TernarySearchTree.forUris(() => this.ignorePathCasing);
+            updated.fill(( this.rawUpdated.map(resource => [resource, true])));
+            return updated;
+        }));
+        this.deleted = ( new Lazy(() => {
+            const deleted = TernarySearchTree.forUris(() => this.ignorePathCasing);
+            deleted.fill(( this.rawDeleted.map(resource => [resource, true])));
+            return deleted;
+        }));
+        this.rawAdded = [];
+        this.rawUpdated = [];
+        this.rawDeleted = [];
+        for (const change of changes) {
+            switch (change.type) {
+                case 1 :
+                    this.rawAdded.push(change.resource);
+                    break;
+                case 0 :
+                    this.rawUpdated.push(change.resource);
+                    break;
+                case 2 :
+                    this.rawDeleted.push(change.resource);
+                    break;
+            }
+            if (this.correlationId !== FileChangesEvent.MIXED_CORRELATION) {
+                if (typeof change.cId === 'number') {
+                    if (this.correlationId === undefined) {
+                        this.correlationId = change.cId;
+                    }
+                    else if (this.correlationId !== change.cId) {
+                        this.correlationId = FileChangesEvent.MIXED_CORRELATION;
+                    }
+                }
+                else {
+                    if (this.correlationId !== undefined) {
+                        this.correlationId = FileChangesEvent.MIXED_CORRELATION;
+                    }
+                }
+            }
+        }
+    }
+    contains(resource, ...types) {
+        return this.doContains(resource, { includeChildren: false }, ...types);
+    }
+    affects(resource, ...types) {
+        return this.doContains(resource, { includeChildren: true }, ...types);
+    }
+    doContains(resource, options, ...types) {
+        if (!resource) {
+            return false;
+        }
+        const hasTypesFilter = types.length > 0;
+        if (!hasTypesFilter || types.includes(1 )) {
+            if (this.added.value.get(resource)) {
+                return true;
+            }
+            if (options.includeChildren && this.added.value.findSuperstr(resource)) {
+                return true;
+            }
+        }
+        if (!hasTypesFilter || types.includes(0 )) {
+            if (this.updated.value.get(resource)) {
+                return true;
+            }
+            if (options.includeChildren && this.updated.value.findSuperstr(resource)) {
+                return true;
+            }
+        }
+        if (!hasTypesFilter || types.includes(2 )) {
+            if (this.deleted.value.findSubstr(resource) ) {
+                return true;
+            }
+            if (options.includeChildren && this.deleted.value.findSuperstr(resource)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    gotAdded() {
+        return this.rawAdded.length > 0;
+    }
+    gotDeleted() {
+        return this.rawDeleted.length > 0;
+    }
+    gotUpdated() {
+        return this.rawUpdated.length > 0;
+    }
+    correlates(correlationId) {
+        return this.correlationId === correlationId;
+    }
+    hasCorrelation() {
+        return typeof this.correlationId === 'number';
+    }
+}
 class ByteSize {
     static { this.KB = 1024; }
     static { this.MB = ByteSize.KB * ByteSize.KB; }
@@ -131,4 +238,4 @@ class ByteSize {
     }
 }
 
-export { ByteSize, FileChangeType, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, markAsFileSystemProviderError, toFileSystemProviderErrorCode };
+export { ByteSize, FileChangeType, FileChangesEvent, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, markAsFileSystemProviderError, toFileSystemProviderErrorCode };