Skip to content

Commit 6cba936

Browse files
authored
Merge pull request microsoft#162318 from microsoft/hediet/amused-whale
Fixes microsoft#162027
2 parents 320f338 + b29b217 commit 6cba936

File tree

4 files changed

+2
-85
lines changed

4 files changed

+2
-85
lines changed

extensions/git/package.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,16 +1590,6 @@
15901590
"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges"
15911591
}
15921592
],
1593-
"mergeEditor/result/title": [
1594-
{
1595-
"command": "git.runGitMerge",
1596-
"when": "isMergeEditor"
1597-
},
1598-
{
1599-
"command": "git.runGitMergeDiff3",
1600-
"when": "isMergeEditor"
1601-
}
1602-
],
16031593
"scm/change/title": [
16041594
{
16051595
"command": "git.stageChange",

src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -603,31 +603,7 @@ export class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
603603
}
604604

605605
override runWithViewModel(viewModel: MergeEditorViewModel, accessor: ServicesAccessor): void {
606-
viewModel.model.resetResultToBaseAndAutoMerge();
607-
}
608-
}
609-
610-
export class ResetDirtyConflictsToBaseCommand extends MergeEditorAction {
611-
constructor() {
612-
super({
613-
id: 'mergeEditor.resetDirtyConflictsToBase',
614-
category: mergeEditorCategory,
615-
title: {
616-
value: localize(
617-
'mergeEditor.resetDirtyConflictsToBase',
618-
'Reset Dirty Conflicts In Result To Base'
619-
),
620-
original: 'Reset Dirty Conflicts In Result To Base',
621-
},
622-
shortTitle: localize('mergeEditor.resetDirtyConflictsToBase.short', 'Reset Dirty Conflicts To Base'),
623-
f1: true,
624-
precondition: ctxIsMergeEditor,
625-
menu: { id: MenuId.MergeInputResultToolbar }
626-
});
627-
}
628-
629-
override runWithViewModel(viewModel: MergeEditorViewModel, accessor: ServicesAccessor): void {
630-
viewModel.model.resetDirtyConflictsToBase();
606+
viewModel.model.reset();
631607
}
632608
}
633609

src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
1111
import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
1212
import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
1313
import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
14-
import { AcceptAllInput1, AcceptAllInput2, AcceptMerge, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, OpenBaseFile, OpenMergeEditor, OpenResultResource, ResetDirtyConflictsToBaseCommand, ResetToBaseAndAutoMergeCommand, SetColumnLayout, SetMixedLayout, ShowHideAtTopBase, ShowHideBase, ShowNonConflictingChanges, ToggleActiveConflictInput1, ToggleActiveConflictInput2 } from 'vs/workbench/contrib/mergeEditor/browser/commands/commands';
14+
import { AcceptAllInput1, AcceptAllInput2, AcceptMerge, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, OpenBaseFile, OpenMergeEditor, OpenResultResource, ResetToBaseAndAutoMergeCommand, SetColumnLayout, SetMixedLayout, ShowHideAtTopBase, ShowHideBase, ShowNonConflictingChanges, ToggleActiveConflictInput1, ToggleActiveConflictInput2 } from 'vs/workbench/contrib/mergeEditor/browser/commands/commands';
1515
import { MergeEditorCopyContentsToJSON, MergeEditorLoadContentsFromFolder, MergeEditorSaveContentsToFolder } from 'vs/workbench/contrib/mergeEditor/browser/commands/devCommands';
1616
import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
1717
import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
@@ -70,7 +70,6 @@ registerAction2(AcceptAllInput1);
7070
registerAction2(AcceptAllInput2);
7171

7272
registerAction2(ResetToBaseAndAutoMergeCommand);
73-
registerAction2(ResetDirtyConflictsToBaseCommand);
7473

7574
registerAction2(AcceptMerge);
7675

@@ -86,23 +85,3 @@ Registry
8685
Registry
8786
.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
8887
.registerWorkbenchContribution(MergeEditorResolverContribution, LifecyclePhase.Starting);
89-
/*
90-
class MergeEditorWorkbenchContribution extends Disposable implements IWorkbenchContribution {
91-
constructor(@IWorkingCopyEditorService private readonly _workingCopyEditorService: IWorkingCopyEditorService) {
92-
super();
93-
94-
this._register(
95-
_workingCopyEditorService.registerHandler({
96-
createEditor(workingCopy) {
97-
throw new BugIndicatingError('not supported');
98-
},
99-
handles(workingCopy) {
100-
return workingCopy.typeId === '';
101-
},
102-
isOpen(workingCopy, editor) {
103-
return workingCopy.resource.toString() === that._model?.resultTextModel.uri.toString();
104-
},
105-
}));
106-
}
107-
}
108-
*/

src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -437,34 +437,6 @@ export class MergeEditorModel extends EditorModel {
437437
});
438438
}
439439

440-
public acceptNonConflictingDiffs(): void {
441-
transaction((tx) => {
442-
/** @description Merge None Conflicting Diffs */
443-
this.resultTextModel.pushStackElement();
444-
for (const m of this.modifiedBaseRanges.get()) {
445-
if (m.isConflicting) {
446-
continue;
447-
}
448-
this.setState(
449-
m,
450-
m.input1Diffs.length > 0
451-
? ModifiedBaseRangeState.default.withInput1(true)
452-
: ModifiedBaseRangeState.default.withInput2(true),
453-
true,
454-
tx,
455-
false
456-
);
457-
}
458-
this.resultTextModel.pushStackElement();
459-
});
460-
}
461-
462-
public async resetResultToBaseAndAutoMerge() {
463-
await waitForState(this.inputDiffComputingState, state => state === MergeEditorModelState.upToDate);
464-
this.resultTextModel.setValue(this.base.getValue());
465-
this.acceptNonConflictingDiffs();
466-
}
467-
468440
public isHandled(baseRange: ModifiedBaseRange): IObservable<boolean> {
469441
return this.modifiedBaseRangeResultStates.get().get(baseRange)!.handled;
470442
}

0 commit comments

Comments
 (0)