@codingame/monaco-vscode-edit-sessions-service-override 5.2.0 → 6.0.0

package/package.json

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

package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { ShutdownReason, LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { registerAction2, Action2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -9,15 +10,17 @@ import { EDIT_SESSION_SYNC_CATEGORY, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_PEND
 import { IEditSessionsStorageService, IEditSessionsLogService } from 'vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { basename, joinPath, relativePath } from 'vscode/vscode/vs/base/common/resources';
 import { encodeBase64 } from 'vscode/vscode/vs/base/common/buffer';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import './editSessionsStorageService.js';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { UserDataSyncStoreError } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { UserDataSyncStoreError, UserDataSyncErrorCode } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -39,8 +42,9 @@ import { IsWebContext } from 'vscode/vscode/vs/platform/contextkey/common/contex
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import '../common/editSessionsLogService.js';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocation, Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { EditSessionsDataViews } from './editSessionsViews.js';
@@ -54,6 +58,7 @@ import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
 import { sha1Hex } from '../../../../base/browser/hash.js';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
@@ -100,14 +105,14 @@ registerAction2(class extends Action2 {
     }
     async run(accessor) {
         const paneCompositePartService = accessor.get(IPaneCompositePartService);
-        const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, 0 , true);
+        const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
         const view = viewlet?.getViewPaneContainer();
         view?.search('@tag:continueOn');
     }
 });
 const resumeProgressOptionsTitle = `[${( localizeWithPath(_moduleId, 4, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
 const resumeProgressOptions = {
-    location: 10 ,
+    location: ProgressLocation.Window,
     type: 'syncing',
 };
 const queryParamName = 'editSessionId';
@@ -185,7 +190,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         this.registerContributedEditSessionOptions();
         this._register(this.fileService.registerProvider(EditSessionsFileSystemProvider.SCHEMA, ( (new EditSessionsFileSystemProvider(this.editSessionsStorageService)))));
         this.lifecycleService.onWillShutdown((e) => {
-            if (e.reason !== 3  && this.editSessionsStorageService.isSignedIn && this.configurationService.getValue('workbench.experimental.cloudChanges.autoStore') === 'onShutdown' && !isWeb) {
+            if (e.reason !== ShutdownReason.RELOAD && this.editSessionsStorageService.isSignedIn && this.configurationService.getValue('workbench.experimental.cloudChanges.autoStore') === 'onShutdown' && !isWeb) {
                 e.join(this.autoStoreEditSession(), { id: 'autoStoreWorkingChanges', label: ( localizeWithPath(_moduleId, 5, 'Storing current working changes...')) });
             }
         });
@@ -203,7 +208,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(undefined, true, undefined, undefined, progress));
         }
         else if (shouldAutoResumeOnReload) {
-            const hasApplicationLaunchedFromContinueOnFlow = this.storageService.getBoolean(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, -1 , false);
+            const hasApplicationLaunchedFromContinueOnFlow = this.storageService.getBoolean(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION, false);
             this.logService.info(`Prompting to enable cloud changes, has application previously launched from Continue On flow: ${hasApplicationLaunchedFromContinueOnFlow}`);
             const handlePendingEditSessions = () => {
                 this.logService.info('Showing badge to enable cloud changes in accounts menu...');
@@ -213,14 +218,14 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     disposable.dispose();
                     this.logService.info('Showing badge to enable cloud changes in accounts menu succeeded, resuming cloud changes...');
                     await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(undefined, true, undefined, undefined, progress));
-                    this.storageService.remove(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, -1 );
+                    this.storageService.remove(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION);
                     this.environmentService.continueOn = undefined;
                 });
             };
             if ((this.environmentService.continueOn !== undefined) &&
                 !this.editSessionsStorageService.isSignedIn &&
                 hasApplicationLaunchedFromContinueOnFlow === false) {
-                this.storageService.store(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, true, -1 , 1 );
+                this.storageService.store(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
                 this.logService.info('Prompting to enable cloud changes...');
                 await this.editSessionsStorageService.initialize('read');
                 if (this.editSessionsStorageService.isSignedIn) {
@@ -250,7 +255,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
     async autoStoreEditSession() {
         const cancellationTokenSource = ( (new CancellationTokenSource()));
         await this.progressService.withProgress({
-            location: 10 ,
+            location: ProgressLocation.Window,
             type: 'syncing',
             title: ( localizeWithPath(_moduleId, 7, 'Storing working changes...'))
         }, async () => this.storeEditSession(false, cancellationTokenSource.token), () => {
@@ -268,7 +273,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             ))),
             icon: EDIT_SESSIONS_VIEW_ICON,
             hideIfEmpty: true
-        }, 0 , { doNotRegisterOpenCommand: true });
+        }, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
         this._register(this.instantiationService.createInstance(EditSessionsDataViews, container));
     }
     registerActions() {
@@ -330,7 +335,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     const cancellationTokenSource = ( (new CancellationTokenSource()));
                     try {
                         ref = await that.progressService.withProgress({
-                            location: 15 ,
+                            location: ProgressLocation.Notification,
                             cancellable: true,
                             type: 'syncing',
                             title: ( localizeWithPath(_moduleId, 9, 'Storing your working changes...'))
@@ -423,7 +428,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             async run(accessor) {
                 const cancellationTokenSource = ( (new CancellationTokenSource()));
                 await that.progressService.withProgress({
-                    location: 15 ,
+                    location: ProgressLocation.Notification,
                     title: ( localizeWithPath(_moduleId, 13, 'Storing working changes...'))
                 }, async () => {
                     that.telemetryService.publicLog2('editSessions.store');
@@ -437,7 +442,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
     }
     async resumeEditSession(ref, silent, forceApplyUnrelatedChange, applyPartialMatch, progress, serializedData) {
         await this.remoteAgentService.getEnvironment();
-        if (this.contextService.getWorkbenchState() === 1 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
             return;
         }
         this.logService.info(ref !== undefined ? `Resuming changes from cloud with ref ${ref}...` : 'Checking for pending cloud changes...');
@@ -671,7 +676,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             this.logService.error(`Failed to store edit session, reason: `, ( (ex.toString())));
             if (ex instanceof UserDataSyncStoreError) {
                 switch (ex.code) {
-                    case "TooLarge" :
+                    case UserDataSyncErrorCode.TooLarge:
                         this.telemetryService.publicLog2('editSessions.upload.failed', { reason: 'TooLarge' });
                         this.notificationService.error(( localizeWithPath(
                             _moduleId,
@@ -828,7 +833,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
     }
     async pickContinueEditSessionDestination() {
         const quickPick = this.quickInputService.createQuickPick();
-        const workspaceContext = this.contextService.getWorkbenchState() === 2
+        const workspaceContext = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER
             ? this.contextService.getWorkspace().folders[0].name
             : ( (this.contextService.getWorkspace().folders.map((folder) => folder.name))).join(', ');
         quickPick.placeholder = ( localizeWithPath(
@@ -1005,7 +1010,7 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
     }
 });
 const workbenchRegistry = ( (Registry.as(Extensions$1.Workbench)));
-workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, 3 );
+workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, LifecyclePhase.Restored);
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     ...workbenchConfigurationNodeBase,
     'properties': {

package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { FileSystemProviderErrorCode, FileType, FilePermission } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, FilePermission } from 'vscode/vscode/vs/platform/files/common/files';
 import { EDIT_SESSIONS_SCHEME, ChangeType, decodeEditSessionFileContent } from '../common/editSessions.js';
 import { IEditSessionsStorageService } from 'vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service';
 import { NotSupportedError } from 'vscode/vscode/vs/base/common/errors';
@@ -10,7 +10,7 @@ let EditSessionsFileSystemProvider = class EditSessionsFileSystemProvider {
     static { this.SCHEMA = EDIT_SESSIONS_SCHEME; }
     constructor(editSessionsStorageService) {
         this.editSessionsStorageService = editSessionsStorageService;
-        this.capabilities = 2048  + 2 ;
+        this.capabilities = FileSystemProviderCapabilities.Readonly + FileSystemProviderCapabilities.FileReadWrite;
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = Event.None;
     }

package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.js

@@ -8,6 +8,7 @@ import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/commo
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { createSyncHeaders } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
@@ -64,7 +65,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
         this._lastWrittenResources = ( (new Map()));
         this._lastReadResources = ( (new Map()));
         this._register(this.authenticationService.onDidChangeSessions((e) => this.onDidChangeSessions(e.event)));
-        this._register(this.storageService.onDidChangeValue(-1 , EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, this._register(( (new DisposableStore()))))(() => this.onDidChangeStorage()));
+        this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, this._register(( (new DisposableStore()))))(() => this.onDidChangeStorage()));
         this.registerSignInAction();
         this.registerResetAuthenticationAction();
         this.signedInContext = EDIT_SESSIONS_SIGNED_IN.bindTo(this.contextKeyService);
@@ -227,7 +228,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
         return undefined;
     }
     shouldAttemptEditSessionInit() {
-        return isWeb && this.storageService.isNew(-1 ) && this.storageService.isNew(1 );
+        return isWeb && this.storageService.isNew(StorageScope.APPLICATION) && this.storageService.isNew(StorageScope.WORKSPACE);
     }
     async getAccountPreference(reason) {
         const quickpick = this.quickInputService.createQuickPick();
@@ -312,15 +313,15 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
         return configuredAuthenticationProviders.filter(({ id }) => ( (availableAuthenticationProviders.some(provider => provider.id === id))));
     }
     get existingSessionId() {
-        return this.storageService.get(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, -1 );
+        return this.storageService.get(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, StorageScope.APPLICATION);
     }
     set existingSessionId(sessionId) {
         this.logService.trace(`Saving authentication session preference for ID ${sessionId}.`);
         if (sessionId === undefined) {
-            this.storageService.remove(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, -1 );
+            this.storageService.remove(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, StorageScope.APPLICATION);
         }
         else {
-            this.storageService.store(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, sessionId, -1 , 1 );
+            this.storageService.store(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, sessionId, StorageScope.APPLICATION, StorageTarget.MACHINE);
         }
     }
     async getExistingSession() {

package/vscode/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.js

@@ -5,10 +5,12 @@ import { stringify, parse } from 'vscode/vscode/vs/base/common/marshalling';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { AbstractSynchroniser } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
+import { SyncResource } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IEditSessionsStorageService } from 'vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service';
 import { IWorkspaceIdentityService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceIdentityService.service';
 
@@ -41,7 +43,7 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
     constructor(profile, collection, userDataSyncStoreService, logService, fileService, environmentService, telemetryService, configurationService, storageService, uriIdentityService, workspaceIdentityService, editSessionsStorageService) {
         const userDataSyncLocalStoreService = ( new NullBackupStoreService());
         const userDataSyncEnablementService = ( new NullEnablementService());
-        super({ syncResource: "workspaceState" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+        super({ syncResource: SyncResource.WorkspaceState, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
         this.workspaceIdentityService = workspaceIdentityService;
         this.editSessionsStorageService = editSessionsStorageService;
         this.version = 1;
@@ -53,13 +55,13 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
             return;
         }
         await this.storageService.flush();
-        const keys = ( this.storageService.keys(1, 0 ));
+        const keys = ( this.storageService.keys(StorageScope.WORKSPACE, StorageTarget.USER));
         if (!keys.length) {
             return;
         }
         const contributedData = {};
         keys.forEach((key) => {
-            const data = this.storageService.get(key, 1 );
+            const data = this.storageService.get(key, StorageScope.WORKSPACE);
             if (data) {
                 contributedData[key] = data;
             }
@@ -95,10 +97,10 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
                 try {
                     const value = parse(storage[key]);
                     replaceUris(value);
-                    storageEntries.push({ key, value, scope: 1 , target: 0  });
+                    storageEntries.push({ key, value, scope: StorageScope.WORKSPACE, target: StorageTarget.USER });
                 }
                 catch {
-                    storageEntries.push({ key, value: storage[key], scope: 1 , target: 0  });
+                    storageEntries.push({ key, value: storage[key], scope: StorageScope.WORKSPACE, target: StorageTarget.USER });
                 }
             }
             this.storageService.storeAll(storageEntries, true);

package/vscode/src/vs/workbench/services/workspaces/common/editSessionIdentityService.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { insert } from 'vscode/vscode/vs/base/common/arrays';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';

package/vscode/src/vs/workbench/services/workspaces/common/workspaceIdentityService.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { isEqualOrParent, relativePath, joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { EditSessionIdentityMatch } from 'vscode/vscode/vs/platform/workspace/common/editSessions';
 import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace/common/editSessions.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';