@codingame/monaco-vscode-working-copy-service-override 9.0.3 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-working-copy-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3",
-    "@codingame/monaco-vscode-files-service-override": "9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0",
+    "@codingame/monaco-vscode-files-service-override": "10.0.0"
   }
 }

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

@@ -7,7 +7,6 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.serv
 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/extensions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 let BrowserWorkingCopyHistoryService = class BrowserWorkingCopyHistoryService extends WorkingCopyHistoryService {

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

@@ -4,7 +4,6 @@ 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 { Promises, ResourceQueue } from 'vscode/vscode/vs/base/common/async';
-import { FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 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';
@@ -256,7 +255,7 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
             await this.fileService.del(backupResource, { recursive: true });
         }
         catch (error) {
-            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
+            if (error.fileOperationResult !== 1 ) {
                 throw error;
             }
         }

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

@@ -1,7 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
 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';
@@ -20,7 +18,7 @@ let WorkingCopyEditorService = class WorkingCopyEditorService extends Disposable
         return toDisposable(() => this.handlers.delete(handler));
     }
     findEditor(workingCopy) {
-        for (const editorIdentifier of this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
+        for (const editorIdentifier of this.editorService.getEditors(0 )) {
             if (this.isOpen(workingCopy, editorIdentifier.editor)) {
                 return editorIdentifier;
             }

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

@@ -4,12 +4,11 @@ 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 { LifecyclePhase } 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 './workingCopyHistory.js';
-import { FileOperationError, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
+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';
@@ -26,13 +25,13 @@ import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 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.service';
-import { lastOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
 
 var WorkingCopyHistoryService_1, NativeWorkingCopyHistoryService_1;
 class WorkingCopyHistoryModel {
     static { this.ENTRIES_FILE = 'entries.json'; }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('default.source', ( localize(8571, "File Saved"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('default.source', ( localize(8647, "File Saved"))); }
     static { this.SETTINGS = {
         MAX_ENTRIES: 'workbench.localHistory.maxFileEntries',
         MERGE_PERIOD: 'workbench.localHistory.mergeWindow'
@@ -74,7 +73,7 @@ class WorkingCopyHistoryModel {
     }
     async addEntry(source = WorkingCopyHistoryModel.FILE_SAVED_SOURCE, sourceDescription = undefined, timestamp = Date.now(), token) {
         let entryToReplace = undefined;
-        const lastEntry = lastOrDefault(this.entries);
+        const lastEntry = this.entries.at(-1);
         if (lastEntry && lastEntry.source === source) {
             const configuredReplaceInterval = this.configurationService.getValue(WorkingCopyHistoryModel.SETTINGS.MERGE_PERIOD, { resource: this.workingCopyResource });
             if (timestamp - lastEntry.timestamp <= ((configuredReplaceInterval * 1000) )) {
@@ -370,7 +369,7 @@ class WorkingCopyHistoryModel {
         );
     }
     isFileNotFound(error) {
-        return error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
+        return error instanceof FileOperationError && error.fileOperationResult === 1 ;
     }
     traceError(error) {
         this.logService.trace('[Working Copy History Service]', error);
@@ -378,8 +377,8 @@ class WorkingCopyHistoryModel {
 }
 let WorkingCopyHistoryService = class WorkingCopyHistoryService extends Disposable {
     static { WorkingCopyHistoryService_1 = this; }
-    static { this.FILE_MOVED_SOURCE = SaveSourceRegistry.registerSource('moved.source', ( localize(8572, "File Moved"))); }
-    static { this.FILE_RENAMED_SOURCE = SaveSourceRegistry.registerSource('renamed.source', ( localize(8573, "File Renamed"))); }
+    static { this.FILE_MOVED_SOURCE = SaveSourceRegistry.registerSource('moved.source', ( localize(8648, "File Moved"))); }
+    static { this.FILE_RENAMED_SOURCE = SaveSourceRegistry.registerSource('renamed.source', ( localize(8649, "File Renamed"))); }
     constructor(fileService, remoteAgentService, environmentService, uriIdentityService, labelService, logService, configurationService) {
         super();
         this.fileService = fileService;
@@ -596,7 +595,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(8574, "Saving local history")) });
+        e.join(this.storeAll(e.token), { id: 'join.workingCopyHistory', label: ( localize(8650, "Saving local history")) });
     }
     onDidChangeModels() {
         if (!this.storeAllScheduler.isScheduled()) {
@@ -633,6 +632,6 @@ NativeWorkingCopyHistoryService = NativeWorkingCopyHistoryService_1 = ( (__decor
     ( (__param(6, ILogService))),
     ( (__param(7, IConfigurationService)))
 ], NativeWorkingCopyHistoryService)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkingCopyHistoryTracker, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkingCopyHistoryTracker, 3 );
 
 export { NativeWorkingCopyHistoryService, WorkingCopyHistoryModel, WorkingCopyHistoryService };

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

@@ -16,7 +16,6 @@ import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/working
 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.service';
-import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 
 var WorkingCopyHistoryTracker_1;
@@ -27,7 +26,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(10892, "Undo / Redo"))); }
+    static { this.UNDO_REDO_SAVE_SOURCE = SaveSourceRegistry.registerSource('undoRedo.source', ( localize(10982, "Undo / Redo"))); }
     constructor(workingCopyService, workingCopyHistoryService, uriIdentityService, pathService, configurationService, undoRedoService, contextService, fileService) {
         super();
         this.workingCopyService = workingCopyService;
@@ -126,7 +125,7 @@ let WorkingCopyHistoryTracker = class WorkingCopyHistoryTracker extends Disposab
         return this.shouldTrackHistory(e.workingCopy.resource, e.stat);
     }
     shouldTrackHistoryFromFileOperationEvent(e) {
-        if (!e.isOperation(FileOperation.MOVE)) {
+        if (!e.isOperation(2 )) {
             return false;
         }
         return this.shouldTrackHistory(e.target.resource, e.target);

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

@@ -1,4 +1,3 @@
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 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';

package/workingCopy.js

@@ -17,7 +17,9 @@ import getServiceOverride$1 from '@codingame/monaco-vscode-files-service-overrid
 
 let BrowserWorkingCopyBackupService = class BrowserWorkingCopyBackupService extends WorkingCopyBackupService {
     constructor(memory, contextService, environmentService, fileService, logService) {
-        super(memory ? undefined : joinPath(environmentService.userRoamingDataHome, 'Backups', contextService.getWorkspace().id), fileService, logService);
+        super(memory
+            ? undefined
+            : joinPath(environmentService.userRoamingDataHome, 'Backups', contextService.getWorkspace().id), fileService, logService);
     }
 };
 BrowserWorkingCopyBackupService = __decorate([