@codingame/monaco-vscode-working-copy-service-override 14.0.6 → 15.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-working-copy-service-override",
-  "version": "14.0.6",
+  "version": "15.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - working-copy service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common": "14.0.6",
-    "@codingame/monaco-vscode-api": "14.0.6",
-    "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common": "14.0.6",
-    "@codingame/monaco-vscode-files-service-override": "14.0.6"
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "15.0.0",
+    "@codingame/monaco-vscode-api": "15.0.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "15.0.0",
+    "@codingame/monaco-vscode-files-service-override": "15.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.d.ts

@@ -6,7 +6,7 @@ import { VSBufferReadable, VSBufferReadableStream } from "@codingame/monaco-vsco
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 export declare class WorkingCopyBackupsModel {
     private backupRoot;
     private fileService;

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

@@ -15,7 +15,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { hash } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { isEmptyObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { NO_TYPE_ID } from '@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { NO_TYPE_ID } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 
 var WorkingCopyBackupServiceImpl_1;
 class WorkingCopyBackupsModel {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.d.ts

@@ -1,6 +1,6 @@
 import { IEditorIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
-import { IWorkingCopy, IWorkingCopyIdentifier } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy, IWorkingCopyIdentifier } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IWorkingCopyEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service";

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

@@ -33,7 +33,7 @@ import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/b
 var WorkingCopyHistoryService_1, NativeWorkingCopyHistoryService_1;
 class WorkingCopyHistoryModel {
     static { this.ENTRIES_FILE = 'entries.json'; }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('default.source', ( localize(12349, "File Saved"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('default.source', ( localize(12461, "File Saved"))); }
     static { this.SETTINGS = {
         MAX_ENTRIES: 'workbench.localHistory.maxFileEntries',
         MERGE_PERIOD: 'workbench.localHistory.mergeWindow'
@@ -379,8 +379,8 @@ class WorkingCopyHistoryModel {
 }
 let WorkingCopyHistoryService = class WorkingCopyHistoryService extends Disposable {
     static { WorkingCopyHistoryService_1 = this; }
-    static { this.FILE_MOVED_SOURCE = SaveSourceRegistry.registerSource('moved.source', ( localize(12350, "File Moved"))); }
-    static { this.FILE_RENAMED_SOURCE = SaveSourceRegistry.registerSource('renamed.source', ( localize(12351, "File Renamed"))); }
+    static { this.FILE_MOVED_SOURCE = SaveSourceRegistry.registerSource('moved.source', ( localize(12462, "File Moved"))); }
+    static { this.FILE_RENAMED_SOURCE = SaveSourceRegistry.registerSource('renamed.source', ( localize(12463, "File Renamed"))); }
     constructor(fileService, remoteAgentService, environmentService, uriIdentityService, labelService, logService, configurationService) {
         super();
         this.fileService = fileService;
@@ -597,7 +597,7 @@ let NativeWorkingCopyHistoryService = class NativeWorkingCopyHistoryService exte
     onWillShutdown(e) {
         this.storeAllScheduler.dispose();
         this.storeAllCts.dispose(true);
-        e.join(this.storeAll(e.token), { id: 'join.workingCopyHistory', label: ( localize(12352, "Saving local history")) });
+        e.join(this.storeAll(e.token), { id: 'join.workingCopyHistory', label: ( localize(12464, "Saving local history")) });
     }
     onDidChangeModels() {
         if (!this.storeAllScheduler.isScheduled()) {

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

@@ -10,12 +10,12 @@ import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { SaveSourceRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
-import { isStoredFileWorkingCopySaveEvent } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { isStoredFileWorkingCopySaveEvent } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
 import { MAX_PARALLEL_HISTORY_IO_OPS } from './workingCopyHistory.js';
 import { IWorkingCopyHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service';
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { ResourceGlobMatcher } from '@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/common/resources';
+import { ResourceGlobMatcher } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/resources';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { FileOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -28,7 +28,7 @@ let WorkingCopyHistoryTracker = class WorkingCopyHistoryTracker extends Disposab
         SIZE_LIMIT: 'workbench.localHistory.maxFileSize',
         EXCLUDES: 'workbench.localHistory.exclude'
     }; }
-    static { this.UNDO_REDO_SAVE_SOURCE = SaveSourceRegistry.registerSource('undoRedo.source', ( localize(12353, "Undo / Redo"))); }
+    static { this.UNDO_REDO_SAVE_SOURCE = SaveSourceRegistry.registerSource('undoRedo.source', ( localize(12465, "Undo / Redo"))); }
     constructor(workingCopyService, workingCopyHistoryService, uriIdentityService, pathService, configurationService, undoRedoService, contextService, fileService) {
         super();
         this.workingCopyService = workingCopyService;

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyService.d.ts

@@ -1,6 +1,6 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IWorkingCopy, IWorkingCopyIdentifier, IWorkingCopySaveEvent as IBaseWorkingCopySaveEvent } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy, IWorkingCopyIdentifier, IWorkingCopySaveEvent as IBaseWorkingCopySaveEvent } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IWorkingCopyService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";
 export interface IWorkingCopySaveEvent extends IBaseWorkingCopySaveEvent {
     readonly workingCopy: IWorkingCopy;
@@ -27,6 +27,12 @@ export declare class WorkingCopyService extends Disposable implements IWorkingCo
     has(resource: URI): boolean;
     get(identifier: IWorkingCopyIdentifier): IWorkingCopy | undefined;
     getAll(resource: URI): readonly IWorkingCopy[] | undefined;
+    private static readonly LEAK_TRACKING_THRESHOLD;
+    private static readonly LEAK_REPORTING_THRESHOLD;
+    private static LEAK_REPORTED;
+    private readonly mapLeakToCounter;
+    private trackLeaks;
+    private untrackLeaks;
     get hasDirty(): boolean;
     get dirtyCount(): number;
     get dirtyWorkingCopies(): IWorkingCopy[];

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

@@ -4,8 +4,16 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Disposable, DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
+class WorkingCopyLeakError extends Error {
+    constructor(message, stack) {
+        super(message);
+        this.name = 'WorkingCopyLeakError';
+        this.stack = stack;
+    }
+}
 class WorkingCopyService extends Disposable {
     constructor() {
         super(...arguments);
@@ -22,6 +30,7 @@ class WorkingCopyService extends Disposable {
         this._workingCopies = ( new Set());
         this.mapResourceToWorkingCopies = ( new ResourceMap());
         this.mapWorkingCopyToListeners = this._register(( new DisposableMap()));
+        this.mapLeakToCounter = ( new Map());
     }
     get workingCopies() { return Array.from(( this._workingCopies.values())); }
     registerWorkingCopy(workingCopy) {
@@ -46,7 +55,11 @@ class WorkingCopyService extends Disposable {
         if (workingCopy.isDirty()) {
             this._onDidChangeDirty.fire(workingCopy);
         }
+        const leakId = this.trackLeaks(workingCopy);
         return toDisposable(() => {
+            if (leakId) {
+                this.untrackLeaks(leakId);
+            }
             this.unregisterWorkingCopy(workingCopy);
             this._onDidUnregister.fire(workingCopy);
         });
@@ -78,6 +91,31 @@ class WorkingCopyService extends Disposable {
         }
         return Array.from(( workingCopies.values()));
     }
+    static { this.LEAK_TRACKING_THRESHOLD = 256; }
+    static { this.LEAK_REPORTING_THRESHOLD = 2 * WorkingCopyService.LEAK_TRACKING_THRESHOLD; }
+    static { this.LEAK_REPORTED = false; }
+    trackLeaks(workingCopy) {
+        if (WorkingCopyService.LEAK_REPORTED || this._workingCopies.size < WorkingCopyService.LEAK_TRACKING_THRESHOLD) {
+            return undefined;
+        }
+        const leakId = `${workingCopy.resource.scheme}#${workingCopy.typeId || '<no typeId>'}\n${( new Error()).stack?.split('\n').slice(2).join('\n') ?? ''}`;
+        const leakCounter = (this.mapLeakToCounter.get(leakId) ?? 0) + 1;
+        this.mapLeakToCounter.set(leakId, leakCounter);
+        if (this._workingCopies.size > WorkingCopyService.LEAK_REPORTING_THRESHOLD) {
+            WorkingCopyService.LEAK_REPORTED = true;
+            const [topLeak, topCount] = Array.from(this.mapLeakToCounter.entries()).reduce(([topLeak, topCount], [key, val]) => val > topCount ? [key, val] : [topLeak, topCount]);
+            const message = `Potential working copy LEAK detected, having ${this._workingCopies.size} working copies already. Most frequent owner (${topCount})`;
+            onUnexpectedError(( new WorkingCopyLeakError(message, topLeak)));
+        }
+        return leakId;
+    }
+    untrackLeaks(leakId) {
+        const stackCounter = (this.mapLeakToCounter.get(leakId) ?? 1) - 1;
+        this.mapLeakToCounter.set(leakId, stackCounter);
+        if (stackCounter === 0) {
+            this.mapLeakToCounter.delete(leakId);
+        }
+    }
     get hasDirty() {
         for (const workingCopy of this._workingCopies) {
             if (workingCopy.isDirty()) {