@codingame/monaco-vscode-working-copy-service-override 5.2.0 → 6.0.0

package/package.json

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

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

@@ -3,10 +3,11 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 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/extensions';
 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.service';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { BrowserWorkingCopyBackupTracker } from './workingCopyBackupTracker.js';
 
 let BrowserWorkingCopyBackupService = class BrowserWorkingCopyBackupService extends WorkingCopyBackupService {
@@ -20,6 +21,6 @@ BrowserWorkingCopyBackupService = ( __decorate([
     ( __param(2, IFileService)),
     ( __param(3, ILogService))
 ], BrowserWorkingCopyBackupService));
-registerWorkbenchContribution2(BrowserWorkingCopyBackupTracker.ID, BrowserWorkingCopyBackupTracker, 1 );
+registerWorkbenchContribution2(BrowserWorkingCopyBackupTracker.ID, BrowserWorkingCopyBackupTracker, WorkbenchPhase.BlockStartup);
 
 export { BrowserWorkingCopyBackupService };

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

@@ -7,6 +7,7 @@ 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,6 +4,7 @@ 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';
@@ -255,7 +256,7 @@ let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Di
             await this.fileService.del(backupResource, { recursive: true });
         }
         catch (error) {
-            if (error.fileOperationResult !== 1 ) {
+            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                 throw error;
             }
         }

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

@@ -1,6 +1,9 @@
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { WorkingCopyCapabilities } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
+import { EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
 
 class WorkingCopyBackupTracker extends Disposable {
     constructor(workingCopyBackupService, workingCopyService, logService, lifecycleService, filesConfigurationService, workingCopyEditorService, editorService, editorGroupService) {
@@ -126,7 +129,7 @@ class WorkingCopyBackupTracker extends Disposable {
             return workingCopy.backupDelay;
         }
         let backupScheduleDelay;
-        if (workingCopy.capabilities & 2 ) {
+        if (workingCopy.capabilities & WorkingCopyCapabilities.Untitled) {
             backupScheduleDelay = 'default';
         }
         else {
@@ -198,7 +201,7 @@ class WorkingCopyBackupTracker extends Disposable {
     }
     get isReady() { return this._isReady; }
     async resolveBackupsToRestore() {
-        await this.lifecycleService.when(3 );
+        await this.lifecycleService.when(LifecyclePhase.Restored);
         for (const backup of await this.workingCopyBackupService.getBackups()) {
             this.unrestoredBackups.add(backup);
         }
@@ -215,7 +218,7 @@ class WorkingCopyBackupTracker extends Disposable {
                 continue;
             }
             let hasOpenedEditorForBackup = false;
-            for (const { editor } of this.editorService.getEditors(0 )) {
+            for (const { editor } of this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
                 const isUnrestoredBackupOpened = handler.isOpen(unrestoredBackup, editor);
                 if (isUnrestoredBackupOpened) {
                     openedEditorsForBackups.add(editor);

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

@@ -1,5 +1,7 @@
 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';
@@ -18,7 +20,7 @@ let WorkingCopyEditorService = class WorkingCopyEditorService extends Disposable
         return toDisposable(() => this.handlers.delete(handler));
     }
     findEditor(workingCopy) {
-        for (const editorIdentifier of this.editorService.getEditors(0 )) {
+        for (const editorIdentifier of this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
             if (this.isOpen(workingCopy, editorIdentifier.editor)) {
                 return editorIdentifier;
             }

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

@@ -4,11 +4,12 @@ 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 } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileOperationError, FileOperationResult } 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';
@@ -25,7 +26,7 @@ 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 } from 'vscode/vscode/vs/base/common/arrays';
+import { lastOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
 
 var WorkingCopyHistoryService_1, NativeWorkingCopyHistoryService_1;
@@ -72,7 +73,7 @@ class WorkingCopyHistoryModel {
     toHistoryEntriesFolder(historyHome, workingCopyResource) {
         return joinPath(historyHome, ( (hash(( (workingCopyResource.toString()))).toString(16))));
     }
-    async addEntry(source = WorkingCopyHistoryModel.FILE_SAVED_SOURCE, timestamp = Date.now(), token) {
+    async addEntry(source = WorkingCopyHistoryModel.FILE_SAVED_SOURCE, sourceDescription = undefined, timestamp = Date.now(), token) {
         let entryToReplace = undefined;
         const lastEntry = lastOrDefault(this.entries);
         if (lastEntry && lastEntry.source === source) {
@@ -83,17 +84,17 @@ class WorkingCopyHistoryModel {
         }
         let entry;
         if (entryToReplace) {
-            entry = await this.doReplaceEntry(entryToReplace, timestamp, token);
+            entry = await this.doReplaceEntry(entryToReplace, source, sourceDescription, timestamp, token);
         }
         else {
-            entry = await this.doAddEntry(source, timestamp, token);
+            entry = await this.doAddEntry(source, sourceDescription, timestamp, token);
         }
         if (this.options.flushOnChange && !token.isCancellationRequested) {
             await this.store(token);
         }
         return entry;
     }
-    async doAddEntry(source, timestamp, token) {
+    async doAddEntry(source, sourceDescription = undefined, timestamp, token) {
         const workingCopyResource = assertIsDefined(this.workingCopyResource);
         const workingCopyName = assertIsDefined(this.workingCopyName);
         const historyEntriesFolder = assertIsDefined(this.historyEntriesFolder);
@@ -105,16 +106,19 @@ class WorkingCopyHistoryModel {
             workingCopy: { resource: workingCopyResource, name: workingCopyName },
             location,
             timestamp,
-            source
+            source,
+            sourceDescription
         };
         this.entries.push(entry);
         this.versionId++;
         this.entryAddedEmitter.fire({ entry });
         return entry;
     }
-    async doReplaceEntry(entry, timestamp, token) {
+    async doReplaceEntry(entry, source, sourceDescription = undefined, timestamp, token) {
         const workingCopyResource = assertIsDefined(this.workingCopyResource);
         await this.fileService.cloneFile(workingCopyResource, entry.location);
+        entry.source = source;
+        entry.sourceDescription = sourceDescription;
         entry.timestamp = timestamp;
         this.versionId++;
         this.entryReplacedEmitter.fire({ entry });
@@ -196,7 +200,8 @@ class WorkingCopyHistoryModel {
                     workingCopy: { resource: workingCopyResource, name: workingCopyName },
                     location: entryStat.resource,
                     timestamp: entryStat.mtime,
-                    source: WorkingCopyHistoryModel.FILE_SAVED_SOURCE
+                    source: WorkingCopyHistoryModel.FILE_SAVED_SOURCE,
+                    sourceDescription: undefined
                 });
             }
         }
@@ -207,30 +212,55 @@ class WorkingCopyHistoryModel {
                     entries.set(entry.id, {
                         ...existingEntry,
                         timestamp: entry.timestamp,
-                        source: entry.source ?? existingEntry.source
+                        source: entry.source ?? existingEntry.source,
+                        sourceDescription: entry.sourceDescription ?? existingEntry.sourceDescription
                     });
                 }
             }
         }
         return entries;
     }
-    async moveEntries(targetWorkingCopyResource, source, token) {
-        await this.store(token);
-        if (token.isCancellationRequested) {
-            return undefined;
-        }
+    async moveEntries(target, source, token) {
+        const timestamp = Date.now();
+        const sourceDescription = this.labelService.getUriLabel(assertIsDefined(this.workingCopyResource));
         const sourceHistoryEntriesFolder = assertIsDefined(this.historyEntriesFolder);
-        const targetHistoryFolder = this.toHistoryEntriesFolder(this.historyHome, targetWorkingCopyResource);
+        const targetHistoryEntriesFolder = assertIsDefined(target.historyEntriesFolder);
         try {
-            await this.fileService.move(sourceHistoryEntriesFolder, targetHistoryFolder, true);
+            for (const entry of this.entries) {
+                await this.fileService.move(entry.location, joinPath(targetHistoryEntriesFolder, entry.id), true);
+            }
+            await this.fileService.del(sourceHistoryEntriesFolder, { recursive: true });
         }
         catch (error) {
-            if (!((error instanceof FileOperationError && error.fileOperationResult === 1) )) {
-                this.traceError(error);
+            if (!this.isFileNotFound(error)) {
+                try {
+                    await this.fileService.move(sourceHistoryEntriesFolder, targetHistoryEntriesFolder, true);
+                }
+                catch (error) {
+                    if (!this.isFileNotFound(error)) {
+                        this.traceError(error);
+                    }
+                }
             }
         }
+        const allEntries = distinct([...this.entries, ...target.entries], entry => entry.id).sort((entryA, entryB) => entryA.timestamp - entryB.timestamp);
+        const targetWorkingCopyResource = assertIsDefined(target.workingCopyResource);
         this.setWorkingCopy(targetWorkingCopyResource);
-        await this.addEntry(source, undefined, token);
+        const targetWorkingCopyName = assertIsDefined(target.workingCopyName);
+        for (const entry of allEntries) {
+            this.entries.push({
+                id: entry.id,
+                location: joinPath(targetHistoryEntriesFolder, entry.id),
+                source: entry.source,
+                sourceDescription: entry.sourceDescription,
+                timestamp: entry.timestamp,
+                workingCopy: {
+                    resource: targetWorkingCopyResource,
+                    name: targetWorkingCopyName
+                }
+            });
+        }
+        await this.addEntry(source, sourceDescription, timestamp, token);
         await this.store(token);
     }
     async store(token) {
@@ -301,6 +331,7 @@ class WorkingCopyHistoryModel {
                 return {
                     id: entry.id,
                     source: entry.source !== WorkingCopyHistoryModel.FILE_SAVED_SOURCE ? entry.source : undefined,
+                    sourceDescription: entry.sourceDescription,
                     timestamp: entry.timestamp
                 };
             })))
@@ -314,7 +345,7 @@ class WorkingCopyHistoryModel {
             serializedModel = JSON.parse(( ((await this.fileService.readFile(historyEntriesListingFile)).value.toString())));
         }
         catch (error) {
-            if (!((error instanceof FileOperationError && error.fileOperationResult === 1) )) {
+            if (!this.isFileNotFound(error)) {
                 this.traceError(error);
             }
         }
@@ -328,7 +359,7 @@ class WorkingCopyHistoryModel {
             rawEntries = (await this.fileService.resolve(historyEntriesFolder, { resolveMetadata: true })).children;
         }
         catch (error) {
-            if (!((error instanceof FileOperationError && error.fileOperationResult === 1) )) {
+            if (!this.isFileNotFound(error)) {
                 this.traceError(error);
             }
         }
@@ -339,6 +370,9 @@ class WorkingCopyHistoryModel {
             historyEntriesNameMatcher.test(entry.name)
         );
     }
+    isFileNotFound(error) {
+        return error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
+    }
     traceError(error) {
         this.logService.trace('[Working Copy History Service]', error);
     }
@@ -419,10 +453,11 @@ let WorkingCopyHistoryService = class WorkingCopyHistoryService extends Disposab
         this._onDidMoveEntries.fire();
         return resources;
     }
-    async doMoveEntries(model, source, sourceWorkingCopyResource, targetWorkingCopyResource) {
-        await model.moveEntries(targetWorkingCopyResource, source, CancellationToken.None);
+    async doMoveEntries(source, saveSource, sourceWorkingCopyResource, targetWorkingCopyResource) {
+        const target = await this.getModel(targetWorkingCopyResource);
+        await source.moveEntries(target, saveSource, CancellationToken.None);
         this.models.delete(sourceWorkingCopyResource);
-        this.models.set(targetWorkingCopyResource, model);
+        this.models.set(targetWorkingCopyResource, source);
         return targetWorkingCopyResource;
     }
     async addEntry({ resource, source, timestamp }, token) {
@@ -433,7 +468,7 @@ let WorkingCopyHistoryService = class WorkingCopyHistoryService extends Disposab
         if (token.isCancellationRequested) {
             return undefined;
         }
-        return model.addEntry(source, timestamp, token);
+        return model.addEntry(source, undefined, timestamp, token);
     }
     async updateEntry(entry, properties, token) {
         const model = await this.getModel(entry.workingCopy.resource);
@@ -599,6 +634,6 @@ NativeWorkingCopyHistoryService = NativeWorkingCopyHistoryService_1 = ( (__decor
     ( (__param(6, ILogService))),
     ( (__param(7, IConfigurationService)))
 ], NativeWorkingCopyHistoryService)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkingCopyHistoryTracker, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkingCopyHistoryTracker, LifecyclePhase.Restored);
 
 export { NativeWorkingCopyHistoryService, WorkingCopyHistoryModel, WorkingCopyHistoryService };

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

@@ -16,6 +16,7 @@ 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;
@@ -126,7 +127,7 @@ let WorkingCopyHistoryTracker = class WorkingCopyHistoryTracker extends Disposab
         return this.shouldTrackHistory(e.workingCopy.resource, e.stat);
     }
     shouldTrackHistoryFromFileOperationEvent(e) {
-        if (!e.isOperation(2 )) {
+        if (!e.isOperation(FileOperation.MOVE)) {
             return false;
         }
         return this.shouldTrackHistory(e.target.resource, e.target);

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

@@ -1,3 +1,4 @@
+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';