@codingame/monaco-vscode-user-data-sync-service-override 7.1.1 → 8.0.1
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.
- package/package.json +3 -3
- package/vscode/src/vs/platform/userDataSync/common/userDataAutoSyncService.js +2 -2
- package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.js +8 -8
- package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.js +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-user-data-sync-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.1",
|
|
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@
|
|
30
|
-
"@codingame/monaco-vscode-user-data-profile-service-override": "
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@8.0.1",
|
|
30
|
+
"@codingame/monaco-vscode-user-data-profile-service-override": "8.0.1"
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -431,13 +431,13 @@ class AutoSync extends Disposable {
|
|
|
431
431
|
if (this.hasSyncServiceChanged()) {
|
|
432
432
|
if (await this.hasDefaultServiceChanged()) {
|
|
433
433
|
throw ( new UserDataAutoSyncError(
|
|
434
|
-
localize(
|
|
434
|
+
localize(3463, "Cannot sync because default service has changed"),
|
|
435
435
|
UserDataSyncErrorCode.DefaultServiceChanged
|
|
436
436
|
));
|
|
437
437
|
}
|
|
438
438
|
else {
|
|
439
439
|
throw ( new UserDataAutoSyncError(
|
|
440
|
-
localize(
|
|
440
|
+
localize(3464, "Cannot sync because sync service has changed"),
|
|
441
441
|
UserDataSyncErrorCode.ServiceChanged
|
|
442
442
|
));
|
|
443
443
|
}
|
|
@@ -64,7 +64,7 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
|
|
|
64
64
|
source: error.operationId ? ( localize(3502, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
|
|
65
65
|
actions: {
|
|
66
66
|
primary: [
|
|
67
|
-
( (new Action('Show Sync Logs', ( localize(
|
|
67
|
+
( (new Action('Show Sync Logs', ( localize(3497, "Show Log")), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)))),
|
|
68
68
|
]
|
|
69
69
|
}
|
|
70
70
|
});
|
|
@@ -231,7 +231,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
231
231
|
"Settings sync was turned off from another device, please turn on sync again."
|
|
232
232
|
)),
|
|
233
233
|
actions: {
|
|
234
|
-
primary: [( (new Action('turn on sync', ( localize(
|
|
234
|
+
primary: [( (new Action('turn on sync', ( localize(8469, "Turn on Settings Sync...")), undefined, true, () => this.turnOn())))]
|
|
235
235
|
}
|
|
236
236
|
});
|
|
237
237
|
break;
|
|
@@ -276,7 +276,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
276
276
|
8475,
|
|
277
277
|
"Settings sync is disabled because the client is making invalid requests. Please report an issue with the logs."
|
|
278
278
|
));
|
|
279
|
-
const operationId = error.operationId ? ( localize(
|
|
279
|
+
const operationId = error.operationId ? ( localize(8474, "Operation Id: {0}", error.operationId)) : undefined;
|
|
280
280
|
this.notificationService.notify({
|
|
281
281
|
severity: Severity$1.Error,
|
|
282
282
|
message: operationId ? `${message} ${operationId}` : message,
|
|
@@ -331,7 +331,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
331
331
|
this.productService.nameLong
|
|
332
332
|
)),
|
|
333
333
|
actions: {
|
|
334
|
-
primary: [( (new Action('turn on sync', ( localize(
|
|
334
|
+
primary: [( (new Action('turn on sync', ( localize(8469, "Turn on Settings Sync...")), undefined, true, () => this.turnOn())))]
|
|
335
335
|
}
|
|
336
336
|
});
|
|
337
337
|
}
|
|
@@ -339,7 +339,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
339
339
|
}
|
|
340
340
|
}
|
|
341
341
|
handleTooLargeError(resource, message, error) {
|
|
342
|
-
const operationId = error.operationId ? ( localize(
|
|
342
|
+
const operationId = error.operationId ? ( localize(8474, "Operation Id: {0}", error.operationId)) : undefined;
|
|
343
343
|
this.notificationService.notify({
|
|
344
344
|
severity: Severity$1.Error,
|
|
345
345
|
message: operationId ? `${message} ${operationId}` : message,
|
|
@@ -401,7 +401,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
401
401
|
errorArea.toLowerCase()
|
|
402
402
|
)),
|
|
403
403
|
actions: {
|
|
404
|
-
primary: [( (new Action('open sync file', ( localize(
|
|
404
|
+
primary: [( (new Action('open sync file', ( localize(8485, "Open {0} File", errorArea)), undefined, true, () => source === SyncResource.Settings ? this.preferencesService.openUserSettings({ jsonEditor: true }) : this.preferencesService.openGlobalKeybindingSettings(true))))]
|
|
405
405
|
}
|
|
406
406
|
});
|
|
407
407
|
this.invalidContentErrorDisposables.set(key, toDisposable(() => {
|
|
@@ -477,7 +477,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
477
477
|
this.productService.version,
|
|
478
478
|
this.productService.commit
|
|
479
479
|
));
|
|
480
|
-
const operationId = e.operationId ? ( localize(
|
|
480
|
+
const operationId = e.operationId ? ( localize(8474, "Operation Id: {0}", e.operationId)) : undefined;
|
|
481
481
|
this.notificationService.notify({
|
|
482
482
|
severity: Severity$1.Error,
|
|
483
483
|
message: operationId ? `${message} ${operationId}` : message,
|
|
@@ -493,8 +493,8 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
493
493
|
)),
|
|
494
494
|
actions: {
|
|
495
495
|
primary: [
|
|
496
|
-
( (new Action('reset', ( localize(
|
|
497
|
-
( (new Action('show synced data', ( localize(
|
|
496
|
+
( (new Action('reset', ( localize(8479, "Clear Data in Cloud...")), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()))),
|
|
497
|
+
( (new Action('show synced data', ( localize(8480, "Show Synced Data")), undefined, true, () => this.userDataSyncWorkbenchService.showSyncActivity())))
|
|
498
498
|
]
|
|
499
499
|
}
|
|
500
500
|
});
|
|
@@ -614,7 +614,7 @@ let UserDataSyncMachinesViewDataProvider = class UserDataSyncMachinesViewDataPro
|
|
|
614
614
|
handle: id,
|
|
615
615
|
collapsibleState: TreeItemCollapsibleState.None,
|
|
616
616
|
label: { label: name },
|
|
617
|
-
description: isCurrent ? ( localize(
|
|
617
|
+
description: isCurrent ? ( localize(10814, "Current")) : undefined,
|
|
618
618
|
themeIcon: platform && isWebPlatform(platform) ? Codicon.globe : Codicon.vm,
|
|
619
619
|
contextValue: 'sync-machine'
|
|
620
620
|
})))
|
|
@@ -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(
|
|
674
|
+
throw ( (new Error(localize(10816, "machine not found with id: {0}", machineId))));
|
|
675
675
|
}
|
|
676
676
|
inputBox.busy = false;
|
|
677
677
|
inputBox.value = machine.name;
|
|
@@ -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(
|
|
767
|
+
description: this.uriIdentityService.extUri.isEqual(logFolder, this.environmentService.logsHome) ? ( localize(10814, "Current")) : undefined,
|
|
768
768
|
command: { id: API_OPEN_EDITOR_COMMAND_ID, title: '', arguments: [syncLogResource, undefined, undefined] },
|
|
769
769
|
});
|
|
770
770
|
}
|