ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-15 18:46:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode cfbd1999769f4f08dce29629fb92fdc0fac53829

Browse Source
This commit is contained in:
ADS Merger
2020-08-06 07:08:52 +00:00
parent 9c67832880
commit 540046ba00
362 changed files with 7588 additions and 6584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts
View File

@@ -54,7 +54,6 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
@IEditorService private readonly editorService: IEditorService,
@IDialogService private readonly dialogService: IDialogService,
@IProgressService private readonly progressService: IProgressService,
@IUserDataSyncService private readonly userDataSyncService: IUserDataSyncService,
@IUserDataSyncWorkbenchService userDataSyncWorkbenchService: IUserDataSyncWorkbenchService,
@IDecorationsService decorationsService: IDecorationsService,
@IKeybindingService keybindingService: IKeybindingService,
@@ -72,7 +71,7 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
this._register(this.userDataSyncPreview.onDidChangeResources(() => this.updateSyncButtonEnablement()));
this._register(this.userDataSyncPreview.onDidChangeResources(() => this.treeView.refresh()));
this._register(this.userDataSyncPreview.onDidChangeResources(() => this.closeConflictEditors()));
this._register(this.userDataSyncPreview.onDidChangeResources(() => this.closeDiffEditors()));
this._register(decorationsService.registerDecorationsProvider(this._register(new UserDataSyncResourcesDecorationProvider(this.userDataSyncPreview))));
this.registerActions();
@@ -91,7 +90,7 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
this.buttonsContainer = DOM.append(container, DOM.$('.manual-sync-buttons-container'));
this.syncButton = this._register(new Button(this.buttonsContainer));
this.syncButton.label = localize('turn on sync', "Turn on Preferences Sync");
this.syncButton.label = localize('turn on sync', "Turn on Settings Sync");
this.updateSyncButtonEnablement();
this._register(attachButtonStyler(this.syncButton, this.themeService));
this._register(this.syncButton.onDidClick(() => this.apply()));
@@ -251,16 +250,14 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
private async acceptLocal(userDataSyncResource: IUserDataSyncResource): Promise<void> {
await this.withProgress(async () => {
const content = await this.userDataSyncService.resolveContent(userDataSyncResource.local);
await this.userDataSyncPreview.accept(userDataSyncResource.syncResource, userDataSyncResource.local, content);
await this.userDataSyncPreview.accept(userDataSyncResource.syncResource, userDataSyncResource.local);
});
await this.reopen(userDataSyncResource);
}
private async acceptRemote(userDataSyncResource: IUserDataSyncResource): Promise<void> {
await this.withProgress(async () => {
const content = await this.userDataSyncService.resolveContent(userDataSyncResource.remote);
await this.userDataSyncPreview.accept(userDataSyncResource.syncResource, userDataSyncResource.remote, content);
await this.userDataSyncPreview.accept(userDataSyncResource.syncResource, userDataSyncResource.remote);
});
await this.reopen(userDataSyncResource);
}
@@ -352,12 +349,13 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
}
}
private closeConflictEditors() {
private closeDiffEditors() {
for (const previewResource of this.userDataSyncPreview.resources) {
if (previewResource.mergeState !== MergeState.Conflict) {
if (previewResource.mergeState === MergeState.Accepted) {
for (const input of this.editorService.editors) {
if (input instanceof DiffEditorInput) {
if (isEqual(previewResource.remote, input.secondary.resource) && isEqual(previewResource.merged, input.primary.resource)) {
if (isEqual(previewResource.remote, input.secondary.resource) &&
(isEqual(previewResource.merged, input.primary.resource) || isEqual(previewResource.local, input.primary.resource))) {
input.dispose();
}
}