Fixes microsoft#158723 (microsoft#159047)

* Fixes microsoft#158723

* Fixes microsoft#158901

Author: hediet

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

@@ -213,14 +213,14 @@ export class OpenResultResource extends MergeEditorAction {
 	}
 }
 
-export class GoToNextConflict extends MergeEditorAction {
+export class GoToNextUnhandledConflict extends MergeEditorAction {
 	constructor() {
 		super({
-			id: 'merge.goToNextConflict',
+			id: 'merge.goToNextUnhandledConflict',
 			category: mergeEditorCategory,
 			title: {
-				value: localize('merge.goToNextConflict', 'Go to Next Conflict'),
-				original: 'Go to Next Conflict',
+				value: localize('merge.goToNextUnhandledConflict', 'Go to Next Unhandled Conflict'),
+				original: 'Go to Next Unhandled Conflict',
 			},
 			icon: Codicon.arrowDown,
 			menu: [
@@ -237,21 +237,21 @@ export class GoToNextConflict extends MergeEditorAction {
 	}
 
 	override runWithViewModel(viewModel: MergeEditorViewModel): void {
-		viewModel.goToNextModifiedBaseRange(true);
+		viewModel.goToNextModifiedBaseRange(r => !viewModel.model.isHandled(r).get());
 	}
 }
 
-export class GoToPreviousConflict extends MergeEditorAction {
+export class GoToPreviousUnhandledConflict extends MergeEditorAction {
 	constructor() {
 		super({
-			id: 'merge.goToPreviousConflict',
+			id: 'merge.goToPreviousUnhandledConflict',
 			category: mergeEditorCategory,
 			title: {
 				value: localize(
-					'merge.goToPreviousConflict',
-					'Go to Previous Conflict'
+					'merge.goToPreviousUnhandledConflict',
+					'Go to Previous Unhandled Conflict'
 				),
-				original: 'Go to Previous Conflict',
+				original: 'Go to Previous Unhandled Conflict',
 			},
 			icon: Codicon.arrowUp,
 			menu: [
@@ -268,7 +268,7 @@ export class GoToPreviousConflict extends MergeEditorAction {
 	}
 
 	override runWithViewModel(viewModel: MergeEditorViewModel): void {
-		viewModel.goToPreviousModifiedBaseRange(true);
+		viewModel.goToPreviousModifiedBaseRange(r => !viewModel.model.isHandled(r).get());
 	}
 }
 

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

@@ -11,7 +11,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { AcceptAllInput1, AcceptAllInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, GoToNextConflict, GoToPreviousConflict, OpenBaseFile, OpenMergeEditor, OpenResultResource, SetColumnLayout, SetMixedLayout, ToggleActiveConflictInput1, ToggleActiveConflictInput2 } from 'vs/workbench/contrib/mergeEditor/browser/commands/commands';
+import { AcceptAllInput1, AcceptAllInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, OpenBaseFile, OpenMergeEditor, OpenResultResource, SetColumnLayout, SetMixedLayout, ToggleActiveConflictInput1, ToggleActiveConflictInput2 } from 'vs/workbench/contrib/mergeEditor/browser/commands/commands';
 import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor, MergeEditorResolverContribution, MergeEditorOpenHandlerContribution } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
@@ -53,8 +53,8 @@ registerAction2(SetColumnLayout);
 registerAction2(OpenMergeEditor);
 registerAction2(OpenBaseFile);
 
-registerAction2(GoToNextConflict);
-registerAction2(GoToPreviousConflict);
+registerAction2(GoToNextUnhandledConflict);
+registerAction2(GoToPreviousUnhandledConflict);
 
 registerAction2(ToggleActiveConflictInput1);
 registerAction2(ToggleActiveConflictInput2);

src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.ts

@@ -54,12 +54,18 @@ export class MergeMarkersController extends Disposable {
 				const startLine = model!.getLineContent(b.lineRange.startLineNumber).substring(0, 20);
 				const endLine = model!.getLineContent(b.lineRange.endLineNumberExclusive - 1).substring(0, 20);
 
+				const conflictingLinesCount = b.lineRange.lineCount - 2;
+
 				const domNode = h('div', [
 					h('div.conflict-zone-root', [
 						h('pre', [startLine]),
 						h('span.dots', ['...']),
 						h('pre', [endLine]),
-						h('span.text', [nls.localize('conflictingLines', "Conflicting Lines")]),
+						h('span.text', [
+							conflictingLinesCount === 1
+								? nls.localize('conflictingLine', "1 Conflicting Line")
+								: nls.localize('conflictingLines', "{0} Conflicting Lines", conflictingLinesCount)
+						]),
 					]),
 				]).root;
 				this.viewZoneIds.push(c.addZone({

src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts

@@ -104,34 +104,34 @@ export class MergeEditorViewModel {
 		}
 	}
 
-	public goToNextModifiedBaseRange(onlyConflicting: boolean): void {
+	public goToNextModifiedBaseRange(predicate: (m: ModifiedBaseRange) => boolean): void {
 		this.goToConflict(
 			(e, l) =>
 				this.model.modifiedBaseRanges
 					.get()
 					.find(
 						(r) =>
-							(!onlyConflicting || r.isConflicting) &&
+							predicate(r) &&
 							this.getRange(e, r, undefined).startLineNumber > l
 					) ||
 				this.model.modifiedBaseRanges
 					.get()
-					.find((r) => !onlyConflicting || r.isConflicting)
+					.find((r) => predicate(r))
 		);
 	}
 
-	public goToPreviousModifiedBaseRange(onlyConflicting: boolean): void {
+	public goToPreviousModifiedBaseRange(predicate: (m: ModifiedBaseRange) => boolean): void {
 		this.goToConflict(
 			(e, l) =>
 				findLast(
 					this.model.modifiedBaseRanges.get(),
 					(r) =>
-						(!onlyConflicting || r.isConflicting) &&
+						predicate(r) &&
 						this.getRange(e, r, undefined).endLineNumberExclusive < l
 				) ||
 				findLast(
 					this.model.modifiedBaseRanges.get(),
-					(r) => !onlyConflicting || r.isConflicting
+					(r) => predicate(r)
 				)
 		);
 	}