@codingame/monaco-vscode-user-data-sync-service-override 2.0.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.js

@@ -8,7 +8,7 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { RawContextKey, ContextKeyExpr, ContextKeyTrueExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -44,24 +44,24 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
-const turnOffSyncCommand = { id: 'workbench.userDataSync.actions.turnOff', title: { value: ( localizeWithPath(
+const turnOffSyncCommand = { id: 'workbench.userDataSync.actions.turnOff', title: ( localize2WithPath(
     'vs/workbench/contrib/userDataSync/browser/userDataSync',
     'stop sync',
-    "Turn Off"
-)), original: 'Turn Off' } };
-const configureSyncCommand = { id: CONFIGURE_SYNC_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Turn Off'
+)) };
+const configureSyncCommand = { id: CONFIGURE_SYNC_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/contrib/userDataSync/browser/userDataSync',
     'configure sync',
-    "Configure..."
-)), original: 'Configure...' } };
+    'Configure...'
+)) };
 const showConflictsCommandId = 'workbench.userDataSync.actions.showConflicts';
 const syncNowCommand = {
     id: 'workbench.userDataSync.actions.syncNow',
-    title: { value: ( localizeWithPath(
+    title: ( localize2WithPath(
         'vs/workbench/contrib/userDataSync/browser/userDataSync',
         'sync now',
-        "Sync Now"
-    )), original: 'Sync Now' },
+        'Sync Now'
+    )),
     description(userDataSyncService) {
         if (userDataSyncService.status === "syncing" ) {
             return ( localizeWithPath(
@@ -81,16 +81,16 @@ const syncNowCommand = {
         return undefined;
     }
 };
-const showSyncSettingsCommand = { id: 'workbench.userDataSync.actions.settings', title: { value: ( localizeWithPath(
+const showSyncSettingsCommand = { id: 'workbench.userDataSync.actions.settings', title: ( localize2WithPath(
     'vs/workbench/contrib/userDataSync/browser/userDataSync',
     'sync settings',
-    "Show Settings"
-)), original: 'Show Settings' }, };
-const showSyncedDataCommand = { id: 'workbench.userDataSync.actions.showSyncedData', title: { value: ( localizeWithPath(
+    'Show Settings'
+)), };
+const showSyncedDataCommand = { id: 'workbench.userDataSync.actions.showSyncedData', title: ( localize2WithPath(
     'vs/workbench/contrib/userDataSync/browser/userDataSync',
     'show synced data',
-    "Show Synced Data"
-)), original: 'Show Synced Data' }, };
+    'Show Synced Data'
+)), };
 const CONTEXT_TURNING_ON_STATE = ( new RawContextKey('userDataSyncTurningOn', false));
 let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution extends Disposable {
     constructor(userDataSyncEnablementService, userDataSyncService, userDataSyncWorkbenchService, contextKeyService, activityService, notificationService, editorService, userDataProfilesService, userDataProfileService, dialogService, quickInputService, instantiationService, outputService, userDataAutoSyncService, textModelResolverService, preferencesService, telemetryService, productService, openerService, authenticationService, userDataSyncStoreManagementService, hostService, commandService, workbenchIssueService) {
@@ -919,11 +919,11 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
             constructor() {
                 super({
                     id: 'workbench.userDataSync.actions.turnOn',
-                    title: { value: ( localizeWithPath(
+                    title: ( localize2WithPath(
                         'vs/workbench/contrib/userDataSync/browser/userDataSync',
                         'global activity turn on sync',
-                        "Backup and Sync Settings..."
-                    )), original: 'Backup and Sync Settings...' },
+                        'Backup and Sync Settings...'
+                    )),
                     category: SYNC_TITLE,
                     f1: true,
                     precondition: when,
@@ -1054,6 +1054,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
         )), original: `Show Conflicts (${this.getConflictsCount()})` };
     }
     registerShowConflictsAction() {
+        this.conflictsActionDisposable.value = undefined;
         const that = this;
         this.conflictsActionDisposable.value = registerAction2(class TurningOnSyncAction extends Action2 {
             constructor() {

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.js

@@ -5,7 +5,7 @@ import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { IUserDataAutoSyncService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.js

@@ -235,7 +235,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
         registerAction2(class extends Action2 {
             constructor() {
                 super({
-                    id: `workbench.actions.sync.resolveResource`,
+                    id: `workbench.actions.sync.${viewId}.resolveResource`,
                     title: ( localizeWithPath(
                         'vs/workbench/contrib/userDataSync/browser/userDataSyncViews',
                         'workbench.actions.sync.resolveResourceRef',
@@ -256,7 +256,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
         registerAction2(class extends Action2 {
             constructor() {
                 super({
-                    id: `workbench.actions.sync.compareWithLocal`,
+                    id: `workbench.actions.sync.${viewId}.compareWithLocal`,
                     title: ( localizeWithPath(
                         'vs/workbench/contrib/userDataSync/browser/userDataSyncViews',
                         'workbench.actions.sync.compareWithLocal',
@@ -295,7 +295,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
         registerAction2(class extends Action2 {
             constructor() {
                 super({
-                    id: `workbench.actions.sync.replaceCurrent`,
+                    id: `workbench.actions.sync.${viewId}.replaceCurrent`,
                     title: ( localizeWithPath(
                         'vs/workbench/contrib/userDataSync/browser/userDataSyncViews',
                         'workbench.actions.sync.replaceCurrent',

package/vscode/src/vs/workbench/{browser → services/userDataProfile/browser}/iconSelectBox.js

@@ -1,5 +1,5 @@
-import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
-import { IconSelectBox } from '../../base/browser/ui/icons/iconSelectBox.js';
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { IconSelectBox } from '../../../../base/browser/ui/icons/iconSelectBox.js';
 import { trackFocus } from 'vscode/vscode/vs/base/browser/dom';
 import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';

package/vscode/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.js

@@ -12,7 +12,8 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { Extensions, TreeItemCollapsibleState, IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions, TreeItemCollapsibleState, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { isUserDataProfile, toUserDataProfile, IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -64,9 +65,9 @@ import { renderMarkdown } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { showWindowLogActionId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
 import { SelectBox } from 'vscode/vscode/vs/base/browser/ui/selectBox/selectBox';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { DEFAULT_ICON, ICONS } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfileIcons';
-import { WorkbenchIconSelectBox } from '../../../browser/iconSelectBox.js';
+import { WorkbenchIconSelectBox } from './iconSelectBox.js';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
 import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 

package/vscode/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.js

@@ -18,7 +18,8 @@ import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -695,7 +696,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
         await this.update('auth failure');
     }
     onDidChangeSessions(e) {
-        if (this.currentSessionId && e.removed.find(session => session.id === this.currentSessionId)) {
+        if (this.currentSessionId && e.removed?.find(session => session.id === this.currentSessionId)) {
             this.currentSessionId = undefined;
         }
         this.update('change in sessions');