@codingame/monaco-vscode-working-copy-service-override 4.4.1 → 4.5.0-improve-code-splitting.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-working-copy-service-override",
-  "version": "4.4.1",
+  "version": "4.5.0-improve-code-splitting.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,8 +17,16 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    }
+  },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.1",
-    "@codingame/monaco-vscode-files-service-override": "4.4.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0-improve-code-splitting.1",
+    "@codingame/monaco-vscode-files-service-override": "4.5.0-improve-code-splitting.1"
   }
 }

package/vscode/src/vs/workbench/services/workingCopy/browser/workingCopyBackupService.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { WorkingCopyBackupService } from '../common/workingCopyBackupService.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { BrowserWorkingCopyBackupTracker } from './workingCopyBackupTracker.js';
 

package/vscode/src/vs/workbench/services/workingCopy/browser/workingCopyBackupTracker.js

@@ -1,13 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
+import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
+import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
+import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { WorkingCopyBackupTracker } from '../common/workingCopyBackupTracker.js';
-import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 
 let BrowserWorkingCopyBackupTracker = class BrowserWorkingCopyBackupTracker extends WorkingCopyBackupTracker {
     static { this.ID = 'workbench.contrib.browserWorkingCopyBackupTracker'; }

package/vscode/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { WorkingCopyHistoryService } from '../common/workingCopyHistoryService.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.js

@@ -3,13 +3,13 @@ import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { deepClone, equals } from 'vscode/vscode/vs/base/common/objects';
-import { ResourceQueue, Promises } from 'vscode/vscode/vs/base/common/async';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { Promises, ResourceQueue } from 'vscode/vscode/vs/base/common/async';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { isReadableStream, peekStream } from 'vscode/vscode/vs/base/common/stream';
 import { VSBuffer, prefixedBufferStream, prefixedBufferReadable, bufferToStream, streamToBuffer, readableToBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { hash } from 'vscode/vscode/vs/base/common/hash';
 import { isEmptyObject } from 'vscode/vscode/vs/base/common/types';

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.js

@@ -0,0 +1,41 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+
+let WorkingCopyEditorService = class WorkingCopyEditorService extends Disposable {
+    constructor(editorService) {
+        super();
+        this.editorService = editorService;
+        this._onDidRegisterHandler = this._register(( new Emitter()));
+        this.onDidRegisterHandler = this._onDidRegisterHandler.event;
+        this.handlers = ( new Set());
+    }
+    registerHandler(handler) {
+        this.handlers.add(handler);
+        this._onDidRegisterHandler.fire(handler);
+        return toDisposable(() => this.handlers.delete(handler));
+    }
+    findEditor(workingCopy) {
+        for (const editorIdentifier of this.editorService.getEditors(0 )) {
+            if (this.isOpen(workingCopy, editorIdentifier.editor)) {
+                return editorIdentifier;
+            }
+        }
+        return undefined;
+    }
+    isOpen(workingCopy, editor) {
+        for (const handler of this.handlers) {
+            if (handler.isOpen(workingCopy, editor)) {
+                return true;
+            }
+        }
+        return false;
+    }
+};
+WorkingCopyEditorService = ( __decorate([
+    ( __param(0, IEditorService))
+], WorkingCopyEditorService));
+
+export { WorkingCopyEditorService };

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyHistory.js

@@ -0,0 +1,3 @@
+const MAX_PARALLEL_HISTORY_IO_OPS = 20;
+
+export { MAX_PARALLEL_HISTORY_IO_OPS };

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.js

@@ -4,26 +4,27 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { WorkingCopyHistoryTracker } from './workingCopyHistoryTracker.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { MAX_PARALLEL_HISTORY_IO_OPS } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { FileOperationError, IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
+import { MAX_PARALLEL_HISTORY_IO_OPS } from './workingCopyHistory.js';
+import { FileOperationError } from 'vscode/vscode/vs/platform/files/common/files';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Limiter, DeferredPromise, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { extname, joinPath, isEqual, dirname } from 'vscode/vscode/vs/base/common/resources';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { hash } from 'vscode/vscode/vs/base/common/hash';
 import { randomPath, indexOfPath } from 'vscode/vscode/vs/base/common/extpath';
 import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { lastOrDefault } from 'vscode/vscode/vs/base/common/arrays';
 import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
 

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.js

@@ -4,18 +4,19 @@ import { Limiter, GlobalIdleValue } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
-import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
+import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { isStoredFileWorkingCopySaveEvent } from 'vscode/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { MAX_PARALLEL_HISTORY_IO_OPS, IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory';
-import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
+import { MAX_PARALLEL_HISTORY_IO_OPS } from './workingCopyHistory.js';
+import { IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service';
+import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { ResourceGlobMatcher } from 'vscode/vscode/vs/workbench/common/resources';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 
 var WorkingCopyHistoryTracker_1;
 let WorkingCopyHistoryTracker = class WorkingCopyHistoryTracker extends Disposable {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyService.js

@@ -0,0 +1,127 @@
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+
+class WorkingCopyService extends Disposable {
+    constructor() {
+        super(...arguments);
+        this._onDidRegister = this._register(( new Emitter()));
+        this.onDidRegister = this._onDidRegister.event;
+        this._onDidUnregister = this._register(( new Emitter()));
+        this.onDidUnregister = this._onDidUnregister.event;
+        this._onDidChangeDirty = this._register(( new Emitter()));
+        this.onDidChangeDirty = this._onDidChangeDirty.event;
+        this._onDidChangeContent = this._register(( new Emitter()));
+        this.onDidChangeContent = this._onDidChangeContent.event;
+        this._onDidSave = this._register(( new Emitter()));
+        this.onDidSave = this._onDidSave.event;
+        this._workingCopies = ( new Set());
+        this.mapResourceToWorkingCopies = ( new ResourceMap());
+        this.mapWorkingCopyToListeners = this._register(( new DisposableMap()));
+    }
+    get workingCopies() { return Array.from(( this._workingCopies.values())); }
+    registerWorkingCopy(workingCopy) {
+        let workingCopiesForResource = this.mapResourceToWorkingCopies.get(workingCopy.resource);
+        if (workingCopiesForResource?.has(workingCopy.typeId)) {
+            throw new Error(`Cannot register more than one working copy with the same resource ${workingCopy.resource.toString()} and type ${workingCopy.typeId}.`);
+        }
+        this._workingCopies.add(workingCopy);
+        if (!workingCopiesForResource) {
+            workingCopiesForResource = ( new Map());
+            this.mapResourceToWorkingCopies.set(workingCopy.resource, workingCopiesForResource);
+        }
+        workingCopiesForResource.set(workingCopy.typeId, workingCopy);
+        const disposables = ( new DisposableStore());
+        disposables.add(workingCopy.onDidChangeContent(() => this._onDidChangeContent.fire(workingCopy)));
+        disposables.add(workingCopy.onDidChangeDirty(() => this._onDidChangeDirty.fire(workingCopy)));
+        disposables.add(workingCopy.onDidSave(e => this._onDidSave.fire({ workingCopy, ...e })));
+        this.mapWorkingCopyToListeners.set(workingCopy, disposables);
+        this._onDidRegister.fire(workingCopy);
+        if (workingCopy.isDirty()) {
+            this._onDidChangeDirty.fire(workingCopy);
+        }
+        return toDisposable(() => {
+            this.unregisterWorkingCopy(workingCopy);
+            this._onDidUnregister.fire(workingCopy);
+        });
+    }
+    unregisterWorkingCopy(workingCopy) {
+        this._workingCopies.delete(workingCopy);
+        const workingCopiesForResource = this.mapResourceToWorkingCopies.get(workingCopy.resource);
+        if (workingCopiesForResource?.delete(workingCopy.typeId) && workingCopiesForResource.size === 0) {
+            this.mapResourceToWorkingCopies.delete(workingCopy.resource);
+        }
+        if (workingCopy.isDirty()) {
+            this._onDidChangeDirty.fire(workingCopy);
+        }
+        this.mapWorkingCopyToListeners.deleteAndDispose(workingCopy);
+    }
+    has(resourceOrIdentifier) {
+        if (URI.isUri(resourceOrIdentifier)) {
+            return ( this.mapResourceToWorkingCopies.has(resourceOrIdentifier));
+        }
+        return this.mapResourceToWorkingCopies.get(resourceOrIdentifier.resource)?.has(resourceOrIdentifier.typeId) ?? false;
+    }
+    get(identifier) {
+        return this.mapResourceToWorkingCopies.get(identifier.resource)?.get(identifier.typeId);
+    }
+    getAll(resource) {
+        const workingCopies = this.mapResourceToWorkingCopies.get(resource);
+        if (!workingCopies) {
+            return undefined;
+        }
+        return Array.from(( workingCopies.values()));
+    }
+    get hasDirty() {
+        for (const workingCopy of this._workingCopies) {
+            if (workingCopy.isDirty()) {
+                return true;
+            }
+        }
+        return false;
+    }
+    get dirtyCount() {
+        let totalDirtyCount = 0;
+        for (const workingCopy of this._workingCopies) {
+            if (workingCopy.isDirty()) {
+                totalDirtyCount++;
+            }
+        }
+        return totalDirtyCount;
+    }
+    get dirtyWorkingCopies() {
+        return this.workingCopies.filter(workingCopy => workingCopy.isDirty());
+    }
+    get modifiedCount() {
+        let totalModifiedCount = 0;
+        for (const workingCopy of this._workingCopies) {
+            if (workingCopy.isModified()) {
+                totalModifiedCount++;
+            }
+        }
+        return totalModifiedCount;
+    }
+    get modifiedWorkingCopies() {
+        return this.workingCopies.filter(workingCopy => workingCopy.isModified());
+    }
+    isDirty(resource, typeId) {
+        const workingCopies = this.mapResourceToWorkingCopies.get(resource);
+        if (workingCopies) {
+            if (typeof typeId === 'string') {
+                return workingCopies.get(typeId)?.isDirty() ?? false;
+            }
+            else {
+                for (const [, workingCopy] of workingCopies) {
+                    if (workingCopy.isDirty()) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
+
+export { WorkingCopyService };

package/workingCopy.js

@@ -1,9 +1,11 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { BrowserWorkingCopyBackupService } from './vscode/src/vs/workbench/services/workingCopy/browser/workingCopyBackupService.js';
-import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IWorkingCopyService, WorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { IWorkingCopyEditorService, WorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
-import { IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory';
+import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
+import { WorkingCopyService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyService.js';
+import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
+import { WorkingCopyEditorService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.js';
+import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
+import { IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service';
 import { BrowserWorkingCopyHistoryService } from './vscode/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.js';
 import getServiceOverride$1 from '@codingame/monaco-vscode-files-service-override';