Skip to content

Commit 4f11be1

Browse files
committed
enhance: do nothing if current line is not in a conflict region
Signed-off-by: leo <longshuang@msn.cn>
1 parent 7f757e1 commit 4f11be1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Views/MergeConflictEditor.axaml.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,14 @@ public void Draw(TextView textView, DrawingContext drawingContext)
161161

162162
var lineIndex = index - 1;
163163
var info = lines[lineIndex];
164-
var lineState = vm.GetLineState(lineIndex);
164+
if (info.Type == Models.ConflictLineType.Common)
165+
continue;
165166

166167
var startY = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineTop) - textView.VerticalOffset;
167168
var endY = line.GetTextLineVisualYPosition(line.TextLines[^1], VisualYPosition.LineBottom) - textView.VerticalOffset;
168169
var rect = new Rect(0, startY, width, endY - startY);
169170

171+
var lineState = vm.GetLineState(lineIndex);
170172
if (lineState == Models.ConflictLineState.ConflictBlockStart)
171173
drawingContext.DrawLine(new Pen(new SolidColorBrush(Colors.Red, 0.6)), new Point(0, startY + 0.5), new Point(width, startY + 0.5));
172174
else if (lineState == Models.ConflictLineState.ConflictBlockEnd)

0 commit comments

Comments
 (0)