@codingame/monaco-vscode-user-data-sync-service-override 10.1.1 → 10.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +3 -3
  2. package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.js +30 -30
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-user-data-sync-service-override",
3
- "version": "10.1.1",
3
+ "version": "10.1.2",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -26,7 +26,7 @@
26
26
  }
27
27
  },
28
28
  "dependencies": {
29
- "vscode": "npm:@codingame/monaco-vscode-api@10.1.1",
30
- "@codingame/monaco-vscode-user-data-profile-service-override": "10.1.1"
29
+ "vscode": "npm:@codingame/monaco-vscode-api@10.1.2",
30
+ "@codingame/monaco-vscode-user-data-profile-service-override": "10.1.2"
31
31
  }
32
32
  }
package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.js CHANGED
@@ -54,7 +54,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
54
54
  }
55
55
  registerConflictsView(container) {
56
56
  const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
57
- const viewName = ( localize2(10953, "Conflicts"));
57
+ const viewName = ( localize2(10945, "Conflicts"));
58
58
  const viewDescriptor = {
59
59
  id: SYNC_CONFLICTS_VIEW_ID,
60
60
  name: viewName,
@@ -70,7 +70,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
70
70
  }
71
71
  registerMachinesView(container) {
72
72
  const id = `workbench.views.sync.machines`;
73
- const name = ( localize2(10954, "Synced Machines"));
73
+ const name = ( localize2(10946, "Synced Machines"));
74
74
  const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
75
75
  const dataProvider = this.instantiationService.createInstance(UserDataSyncMachinesViewDataProvider, treeView);
76
76
  treeView.showRefreshAction = true;
@@ -98,7 +98,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
98
98
  constructor() {
99
99
  super({
100
100
  id: `workbench.actions.sync.editMachineName`,
101
- title: ( localize(10955, "Edit Name")),
101
+ title: ( localize(10947, "Edit Name")),
102
102
  icon: Codicon.edit,
103
103
  menu: {
104
104
  id: MenuId.ViewItemContext,
@@ -118,7 +118,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
118
118
  constructor() {
119
119
  super({
120
120
  id: `workbench.actions.sync.turnOffSyncOnMachine`,
121
- title: ( localize(10956, "Turn off Settings Sync")),
121
+ title: ( localize(10948, "Turn off Settings Sync")),
122
122
  menu: {
123
123
  id: MenuId.ViewItemContext,
124
124
  when: ( (ContextKeyExpr.and(
@@ -137,7 +137,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
137
137
  }
138
138
  registerActivityView(container, remote) {
139
139
  const id = `workbench.views.sync.${remote ? 'remote' : 'local'}Activity`;
140
- const name = remote ? ( localize2(10957, "Sync Activity (Remote)")) : ( localize2(10958, "Sync Activity (Local)"));
140
+ const name = remote ? ( localize2(10949, "Sync Activity (Remote)")) : ( localize2(10950, "Sync Activity (Local)"));
141
141
  const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
142
142
  treeView.showCollapseAllAction = true;
143
143
  treeView.showRefreshAction = true;
@@ -166,7 +166,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
166
166
  }
167
167
  registerExternalActivityView(container) {
168
168
  const id = `workbench.views.sync.externalActivity`;
169
- const name = ( localize2(10959, "Sync Activity (Developer)"));
169
+ const name = ( localize2(10951, "Sync Activity (Developer)"));
170
170
  const dataProvider = this.instantiationService.createInstance(ExtractedUserDataSyncActivityViewDataProvider, undefined);
171
171
  const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
172
172
  treeView.showCollapseAllAction = false;
@@ -189,7 +189,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
189
189
  constructor() {
190
190
  super({
191
191
  id: `workbench.actions.sync.loadActivity`,
192
- title: ( localize(10960, "Load Sync Activity")),
192
+ title: ( localize(10952, "Load Sync Activity")),
193
193
  icon: Codicon.cloudUpload,
194
194
  menu: {
195
195
  id: MenuId.ViewTitle,
@@ -201,7 +201,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
201
201
  async run(accessor) {
202
202
  const fileDialogService = accessor.get(IFileDialogService);
203
203
  const result = await fileDialogService.showOpenDialog({
204
- title: ( localize(10961, "Select Sync Activity File or Folder")),
204
+ title: ( localize(10953, "Select Sync Activity File or Folder")),
205
205
  canSelectFiles: true,
206
206
  canSelectFolders: true,
207
207
  canSelectMany: false,
@@ -219,7 +219,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
219
219
  constructor() {
220
220
  super({
221
221
  id: `workbench.actions.sync.${viewId}.resolveResource`,
222
- title: ( localize(10962, "Show raw JSON sync data")),
222
+ title: ( localize(10954, "Show raw JSON sync data")),
223
223
  menu: {
224
224
  id: MenuId.ViewItemContext,
225
225
  when: ( (ContextKeyExpr.and(
@@ -239,7 +239,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
239
239
  constructor() {
240
240
  super({
241
241
  id: `workbench.actions.sync.${viewId}.compareWithLocal`,
242
- title: ( localize(10963, "Compare with Local")),
242
+ title: ( localize(10955, "Compare with Local")),
243
243
  menu: {
244
244
  id: MenuId.ViewItemContext,
245
245
  when: ( (ContextKeyExpr.and(
@@ -254,14 +254,14 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
254
254
  const { resource, comparableResource } = JSON.parse(handle.$treeItemHandle);
255
255
  const remoteResource = ( (URI.parse(resource)));
256
256
  const localResource = ( (URI.parse(comparableResource)));
257
- return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, remoteResource, localResource, ( localize(10964, "{0} ↔ {1}", ( localize(10965, "{0} (Remote)", basename(remoteResource))), ( localize(10966, "{0} (Local)", basename(localResource))))), undefined);
257
+ return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, remoteResource, localResource, ( localize(10956, "{0} ↔ {1}", ( localize(10957, "{0} (Remote)", basename(remoteResource))), ( localize(10958, "{0} (Local)", basename(localResource))))), undefined);
258
258
  }
259
259
  }));
260
260
  this._register(registerAction2(class extends Action2 {
261
261
  constructor() {
262
262
  super({
263
263
  id: `workbench.actions.sync.${viewId}.replaceCurrent`,
264
- title: ( localize(10967, "Restore")),
264
+ title: ( localize(10959, "Restore")),
265
265
  icon: Codicon.discard,
266
266
  menu: {
267
267
  id: MenuId.ViewItemContext,
@@ -280,7 +280,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
280
280
  const { syncResourceHandle, syncResource } = JSON.parse(handle.$treeItemHandle);
281
281
  const result = await dialogService.confirm({
282
282
  message: ( localize(
283
- 10968,
283
+ 10960,
284
284
  "Would you like to replace your current {0} with selected?",
285
285
  getSyncAreaLabel(syncResource)
286
286
  )),
@@ -295,7 +295,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
295
295
  }
296
296
  registerTroubleShootView(container) {
297
297
  const id = `workbench.views.sync.troubleshoot`;
298
- const name = ( localize2(10969, "Troubleshoot"));
298
+ const name = ( localize2(10961, "Troubleshoot"));
299
299
  const treeView = this.instantiationService.createInstance(TreeView, id, name.value);
300
300
  const dataProvider = this.instantiationService.createInstance(UserDataSyncTroubleshootViewDataProvider);
301
301
  treeView.showRefreshAction = true;
@@ -359,7 +359,7 @@ let UserDataSyncActivityViewDataProvider = class UserDataSyncActivityViewDataPro
359
359
  message: error.message,
360
360
  actions: {
361
361
  primary: [
362
- ( (new Action('reset', ( localize(10970, "Reset Synced Data")), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()))),
362
+ ( (new Action('reset', ( localize(10962, "Reset Synced Data")), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()))),
363
363
  ]
364
364
  }
365
365
  });
@@ -416,7 +416,7 @@ let UserDataSyncActivityViewDataProvider = class UserDataSyncActivityViewDataPro
416
416
  previousResource,
417
417
  resource,
418
418
  ( localize(
419
- 10971,
419
+ 10963,
420
420
  "{0} ↔ {1}",
421
421
  `${basename(resource)} (${fromNow(syncResourceHandle.previous.created, true)})`,
422
422
  `${basename(resource)} (${fromNow(syncResourceHandle.created, true)})`
@@ -514,7 +514,7 @@ let RemoteUserDataSyncActivityViewDataProvider = class RemoteUserDataSyncActivit
514
514
  if (machineId) {
515
515
  const machines = await this.getMachines();
516
516
  const machine = machines.find(({ id }) => id === machineId);
517
- children[0].description = machine?.isCurrent ? ( localize(10972, "Current")) : machine?.name;
517
+ children[0].description = machine?.isCurrent ? ( localize(10964, "Current")) : machine?.name;
518
518
  }
519
519
  }
520
520
  return children;
@@ -570,7 +570,7 @@ let ExtractedUserDataSyncActivityViewDataProvider = class ExtractedUserDataSyncA
570
570
  if (machineId) {
571
571
  const machines = await this.getMachines();
572
572
  const machine = machines.find(({ id }) => id === machineId);
573
- children[0].description = machine?.isCurrent ? ( localize(10972, "Current")) : machine?.name;
573
+ children[0].description = machine?.isCurrent ? ( localize(10964, "Current")) : machine?.name;
574
574
  }
575
575
  }
576
576
  return children;
@@ -608,13 +608,13 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
608
608
  try {
609
609
  let machines = await this.getMachines();
610
610
  machines = machines.filter(m => !m.disabled).sort((m1, m2) => m1.isCurrent ? -1 : 1);
611
- this.treeView.message = machines.length ? undefined : ( localize(10973, "No Machines"));
611
+ this.treeView.message = machines.length ? undefined : ( localize(10965, "No Machines"));
612
612
  return (
613
613
  (machines.map(({ id, name, isCurrent, platform }) => ({
614
614
  handle: id,
615
615
  collapsibleState: TreeItemCollapsibleState.None,
616
616
  label: { label: name },
617
- description: isCurrent ? ( localize(10972, "Current")) : undefined,
617
+ description: isCurrent ? ( localize(10964, "Current")) : undefined,
618
618
  themeIcon: platform && isWebPlatform(platform) ? Codicon.globe : Codicon.vm,
619
619
  contextValue: 'sync-machine'
620
620
  })))
@@ -635,17 +635,17 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
635
635
  const machines = await this.getMachines();
636
636
  const machinesToDisable = machines.filter(({ id }) => machineIds.includes(id));
637
637
  if (!machinesToDisable.length) {
638
- throw ( (new Error(localize(10974, "machine not found with id: {0}", machineIds.join(',')))));
638
+ throw ( (new Error(localize(10966, "machine not found with id: {0}", machineIds.join(',')))));
639
639
  }
640
640
  const result = await this.dialogService.confirm({
641
641
  type: 'info',
642
- message: machinesToDisable.length > 1 ? ( localize(10975, "Are you sure you want to turn off sync on selected machines?"))
642
+ message: machinesToDisable.length > 1 ? ( localize(10967, "Are you sure you want to turn off sync on selected machines?"))
643
643
  : ( localize(
644
- 10976,
644
+ 10968,
645
645
  "Are you sure you want to turn off sync on {0}?",
646
646
  machinesToDisable[0].name
647
647
  )),
648
- primaryButton: ( localize(10977, "&&Turn off")),
648
+ primaryButton: ( localize(10969, "&&Turn off")),
649
649
  });
650
650
  if (!result.confirmed) {
651
651
  return false;
@@ -663,7 +663,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
663
663
  async rename(machineId) {
664
664
  const disposableStore = ( (new DisposableStore()));
665
665
  const inputBox = disposableStore.add(this.quickInputService.createInputBox());
666
- inputBox.placeholder = ( localize(10978, "Enter the name of the machine"));
666
+ inputBox.placeholder = ( localize(10970, "Enter the name of the machine"));
667
667
  inputBox.busy = true;
668
668
  inputBox.show();
669
669
  const machines = await this.getMachines();
@@ -671,7 +671,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
671
671
  if (!machine) {
672
672
  inputBox.hide();
673
673
  disposableStore.dispose();
674
- throw ( (new Error(localize(10974, "machine not found with id: {0}", machineId))));
674
+ throw ( (new Error(localize(10966, "machine not found with id: {0}", machineId))));
675
675
  }
676
676
  inputBox.busy = false;
677
677
  inputBox.value = machine.name;
@@ -679,7 +679,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
679
679
  machineName = machineName.trim();
680
680
  return machineName && !( (machines.some(m => m.id !== machineId && m.name === machineName))) ? machineName : null;
681
681
  };
682
- disposableStore.add(inputBox.onDidChangeValue(() => inputBox.validationMessage = validateMachineName(inputBox.value) ? '' : ( localize(10979, "Machine name should be unique and not empty"))));
682
+ disposableStore.add(inputBox.onDidChangeValue(() => inputBox.validationMessage = validateMachineName(inputBox.value) ? '' : ( localize(10971, "Machine name should be unique and not empty"))));
683
683
  return (
684
684
  (new Promise((c, e) => {
685
685
  disposableStore.add(inputBox.onDidAccept(async () => {
@@ -721,12 +721,12 @@ let UserDataSyncTroubleshootViewDataProvider = class UserDataSyncTroubleshootVie
721
721
  return [{
722
722
  handle: 'SYNC_LOGS',
723
723
  collapsibleState: TreeItemCollapsibleState.Collapsed,
724
- label: { label: ( localize(10980, "Logs")) },
724
+ label: { label: ( localize(10972, "Logs")) },
725
725
  themeIcon: Codicon.folder,
726
726
  }, {
727
727
  handle: 'LAST_SYNC_STATES',
728
728
  collapsibleState: TreeItemCollapsibleState.Collapsed,
729
- label: { label: ( localize(10981, "Last Synced Remotes")) },
729
+ label: { label: ( localize(10973, "Last Synced Remotes")) },
730
730
  themeIcon: Codicon.folder,
731
731
  }];
732
732
  }
@@ -764,7 +764,7 @@ let UserDataSyncTroubleshootViewDataProvider = class UserDataSyncTroubleshootVie
764
764
  collapsibleState: TreeItemCollapsibleState.None,
765
765
  resourceUri: syncLogResource,
766
766
  label: { label: this.uriIdentityService.extUri.basename(logFolder) },
767
- description: this.uriIdentityService.extUri.isEqual(logFolder, this.environmentService.logsHome) ? ( localize(10972, "Current")) : undefined,
767
+ description: this.uriIdentityService.extUri.isEqual(logFolder, this.environmentService.logsHome) ? ( localize(10964, "Current")) : undefined,
768
768
  command: { id: API_OPEN_EDITOR_COMMAND_ID, title: '', arguments: [syncLogResource, undefined, undefined] },
769
769
  });
770
770
  }