Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #99274

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-06-04 14:23:13 +02:00
parent 353e8f4fba
commit 0bf375a847
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View File

@@ -248,12 +248,12 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
localize('Replace or Merge', "Replace or Merge"),
[
localize('show synced data', "Show Synced Data"),
localize('cancel', "Cancel"),
localize('merge', "Merge"),
localize('replace local', "Replace Local"),
localize('cancel', "Cancel"),
],
{
cancelId: 1,
cancelId: 3,
detail: localize('first time sync detail', "It looks like you last synced from another machine.\nWould you like to replace or merge with the synced data?"),
}
);
@@ -263,15 +263,15 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
await this.commandService.executeCommand(SHOW_SYNCED_DATA_COMMAND_ID);
throw canceled();
case 1:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'cancelled' });
throw canceled();
case 2:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'merge' });
break;
case 3:
case 2:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'replace-local' });
await this.userDataSyncService.pull();
break;
case 3:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'cancelled' });
throw canceled();
}
}