remove old way of handling conflicts (microsoft#153456)

Author: sandy081

src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts

@@ -6,10 +6,10 @@
 import { Action } from 'vs/base/common/actions';
 import { getErrorMessage, isCancellationError } from 'vs/base/common/errors';
 import { Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable, IDisposable } from 'vs/base/common/lifecycle';
 import { isEqual, basename } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
-import { registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import type { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
@@ -59,10 +59,6 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
-import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorResolution } from 'vs/platform/editor/common/editor';
 
 const CONTEXT_CONFLICTS_SOURCES = new RawContextKey<string>('conflictsSources', '');
 
@@ -169,7 +165,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			this.registerViews();
 
 			textModelResolverService.registerTextModelContentProvider(USER_DATA_SYNC_SCHEME, instantiationService.createInstance(UserDataRemoteContentProvider));
-			registerEditorContribution(AcceptChangesContribution.ID, AcceptChangesContribution);
 
 			this._register(Event.any(userDataSyncService.onDidChangeStatus, userDataSyncEnablementService.onDidChangeEnablement)
 				(() => this.turningOnSync = !userDataSyncEnablementService.isEnabled() && userDataSyncService.status !== SyncStatus.Idle));
@@ -730,35 +725,17 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 	}
 
 	private async handleConflicts([syncResource, conflicts]: [SyncResource, IResourcePreview[]]): Promise<void> {
-		const useMergeEditor = this.configurationService.getValue('settingsSync.mergeEditor') ?? true;
 		for (const conflict of conflicts) {
-			if (useMergeEditor) {
-				const remoteResourceName = localize({ key: 'remoteResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(conflict.remoteResource));
-				const localResourceName = localize('localResourceName', "{0} (Local)", basename(conflict.remoteResource));
-				const input = this.instantiationService.createInstance(
-					MergeEditorInput,
-					conflict.baseResource,
-					{ title: localize('Yours', 'Yours'), description: localResourceName, detail: undefined, uri: conflict.localResource },
-					{ title: localize('Theirs', 'Theirs'), description: remoteResourceName, detail: undefined, uri: conflict.remoteResource },
-					conflict.previewResource,
-				);
-				await this.editorService.openEditor(input);
-			} else {
-				const leftResourceName = localize({ key: 'leftResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(conflict.remoteResource));
-				const rightResourceName = localize('merges', "{0} (Merges)", basename(conflict.previewResource));
-				await this.editorService.openEditor({
-					original: { resource: conflict.remoteResource },
-					modified: { resource: conflict.previewResource },
-					label: localize('sideBySideLabels', "{0} ↔ {1}", leftResourceName, rightResourceName),
-					description: localize('sideBySideDescription', "Settings Sync"),
-					options: {
-						preserveFocus: false,
-						pinned: true,
-						revealIfVisible: true,
-						override: EditorResolution.DISABLED
-					},
-				});
-			}
+			const remoteResourceName = localize({ key: 'remoteResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(conflict.remoteResource));
+			const localResourceName = localize('localResourceName', "{0} (Local)", basename(conflict.remoteResource));
+			const input = this.instantiationService.createInstance(
+				MergeEditorInput,
+				conflict.baseResource,
+				{ title: localize('Yours', 'Yours'), description: localResourceName, detail: undefined, uri: conflict.localResource },
+				{ title: localize('Theirs', 'Theirs'), description: remoteResourceName, detail: undefined, uri: conflict.remoteResource },
+				conflict.previewResource,
+			);
+			await this.editorService.openEditor(input);
 		}
 	}
 
@@ -1394,131 +1371,3 @@ class UserDataRemoteContentProvider implements ITextModelContentProvider {
 		return null;
 	}
 }
-
-class AcceptChangesContribution extends Disposable implements IEditorContribution {
-
-	static get(editor: ICodeEditor): AcceptChangesContribution | null {
-		return editor.getContribution<AcceptChangesContribution>(AcceptChangesContribution.ID);
-	}
-
-	public static readonly ID = 'editor.contrib.acceptChangesButton';
-
-	private acceptChangesButton: FloatingClickWidget | undefined;
-
-	constructor(
-		private editor: ICodeEditor,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IUserDataSyncService private readonly userDataSyncService: IUserDataSyncService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
-	) {
-		super();
-
-		this.update();
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		this._register(this.editor.onDidChangeModel(() => this.update()));
-		this._register(this.userDataSyncService.onDidChangeConflicts(() => this.update()));
-		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('diffEditor.renderSideBySide'))(() => this.update()));
-	}
-
-	private update(): void {
-		if (!this.shouldShowButton(this.editor)) {
-			this.disposeAcceptChangesWidgetRenderer();
-			return;
-		}
-
-		this.createAcceptChangesWidgetRenderer();
-	}
-
-	private shouldShowButton(editor: ICodeEditor): boolean {
-		const model = editor.getModel();
-		if (!model) {
-			return false; // we need a model
-		}
-
-		if (!this.userDataSyncEnablementService.isEnabled()) {
-			return false;
-		}
-
-		const syncResourceConflicts = this.getSyncResourceConflicts(model.uri);
-		if (!syncResourceConflicts) {
-			return false;
-		}
-
-		if (syncResourceConflicts[1].some(({ previewResource }) => isEqual(previewResource, model.uri))) {
-			return true;
-		}
-
-		if (syncResourceConflicts[1].some(({ remoteResource }) => isEqual(remoteResource, model.uri))) {
-			return this.configurationService.getValue('diffEditor.renderSideBySide');
-		}
-
-		return false;
-	}
-
-	private createAcceptChangesWidgetRenderer(): void {
-		if (!this.acceptChangesButton) {
-			const resource = this.editor.getModel()!.uri;
-			const [syncResource, conflicts] = this.getSyncResourceConflicts(resource)!;
-			const isRemote = conflicts.some(({ remoteResource }) => isEqual(remoteResource, resource));
-			const acceptRemoteLabel = localize('accept remote', "Accept Remote");
-			const acceptMergesLabel = localize('accept merges', "Accept Merges");
-			const acceptRemoteButtonLabel = localize('accept remote button', "Accept &&Remote");
-			const acceptMergesButtonLabel = localize('accept merges button', "Accept &&Merges");
-			this.acceptChangesButton = this.instantiationService.createInstance(FloatingClickWidget, this.editor, isRemote ? acceptRemoteLabel : acceptMergesLabel, null);
-			this._register(this.acceptChangesButton.onClick(async () => {
-				const model = this.editor.getModel();
-				if (model) {
-					this.telemetryService.publicLog2<{ source: string; action: string }, SyncConflictsClassification>('sync/handleConflicts', { source: syncResource, action: isRemote ? 'acceptRemote' : 'acceptLocal' });
-					const syncAreaLabel = getSyncAreaLabel(syncResource);
-					const result = await this.dialogService.confirm({
-						type: 'info',
-						title: isRemote
-							? localize('Sync accept remote', "{0}: {1}", SYNC_TITLE, acceptRemoteLabel)
-							: localize('Sync accept merges', "{0}: {1}", SYNC_TITLE, acceptMergesLabel),
-						message: isRemote
-							? localize('confirm replace and overwrite local', "Would you like to accept remote {0} and replace local {1}?", syncAreaLabel.toLowerCase(), syncAreaLabel.toLowerCase())
-							: localize('confirm replace and overwrite remote', "Would you like to accept merges and replace remote {0}?", syncAreaLabel.toLowerCase()),
-						primaryButton: isRemote ? acceptRemoteButtonLabel : acceptMergesButtonLabel
-					});
-					if (result.confirmed) {
-						try {
-							await this.userDataSyncService.accept(syncResource, model.uri, model.getValue(), true);
-						} catch (e) {
-							if (e instanceof UserDataSyncError && e.code === UserDataSyncErrorCode.LocalPreconditionFailed) {
-								const syncResourceCoflicts = this.userDataSyncService.conflicts.filter(syncResourceCoflicts => syncResourceCoflicts[0] === syncResource)[0];
-								if (syncResourceCoflicts && conflicts.some(conflict => isEqual(conflict.previewResource, model.uri) || isEqual(conflict.remoteResource, model.uri))) {
-									this.notificationService.warn(localize('update conflicts', "Could not resolve conflicts as there is new local version available. Please try again."));
-								}
-							} else {
-								this.notificationService.error(localize('accept failed', "Error while accepting changes. Please check [logs]({0}) for more details.", `command:${SHOW_SYNC_LOG_COMMAND_ID}`));
-							}
-						}
-					}
-				}
-			}));
-
-			this.acceptChangesButton.render();
-		}
-	}
-
-	private getSyncResourceConflicts(resource: URI): [SyncResource, IResourcePreview[]] | undefined {
-		return this.userDataSyncService.conflicts.filter(([, conflicts]) => conflicts.some(({ previewResource, remoteResource }) => isEqual(previewResource, resource) || isEqual(remoteResource, resource)))[0];
-	}
-
-	private disposeAcceptChangesWidgetRenderer(): void {
-		dispose(this.acceptChangesButton);
-		this.acceptChangesButton = undefined;
-	}
-
-	override dispose(): void {
-		this.disposeAcceptChangesWidgetRenderer();
-		super.dispose();
-	}
-}