Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

#100346 change the order of dialog options

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-16 14:01:46 +02:00
parent 1f3a4f124f
commit a786284f7d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,9 +304,9 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
Severity.Info,
localize('Replace or Merge', "Replace or Merge"),
[
localize('sync manually', "Sync Manually"),
localize('merge', "Merge"),
localize('replace local', "Replace Local"),
localize('sync manually', "Sync Manually"),
localize('cancel', "Cancel"),
],
{
@@ -316,14 +316,14 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
);
switch (result.choice) {
case 0:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'manual' });
return 'manual';
case 1:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'merge' });
return 'merge';
case 2:
case 1:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'pull' });
return 'pull';
case 2:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'manual' });
return 'manual';
}
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'cancelled' });
throw canceled();