Skip to content

Commit ec6736a

Browse files
committed
fix: text diff editor crash when clicking selected text in LOCAL CHANGES view
Signed-off-by: leo <longshuang@msn.cn>
1 parent 9e930de commit ec6736a

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/Views/MergeConflictEditor.axaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ private void OnTextViewPointerChanged(object sender, PointerEventArgs e)
408408
if (DataContext is not ViewModels.MergeConflictEditor vm)
409409
return;
410410

411-
if (sender is not TextView view)
411+
if (sender is not TextView { VisualLinesValid: true } view)
412412
return;
413413

414414
UpdateSelectedChunkPosition(vm, e.GetPosition(view).Y + view.VerticalOffset);
@@ -419,7 +419,7 @@ private void OnTextViewPointerWheelChanged(object sender, PointerWheelEventArgs
419419
if (DataContext is not ViewModels.MergeConflictEditor vm)
420420
return;
421421

422-
if (sender is not TextView view)
422+
if (sender is not TextView { VisualLinesValid: true } view)
423423
return;
424424

425425
var y = e.GetPosition(view).Y + view.VerticalOffset;

src/Views/TextDiffView.axaml.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,9 @@ protected override void UpdateSelectedChunk(double y)
10241024
return;
10251025

10261026
var view = TextArea.TextView;
1027+
if (!view.VisualLinesValid)
1028+
return;
1029+
10271030
var selection = TextArea.Selection;
10281031
if (!selection.IsEmpty)
10291032
{
@@ -1212,6 +1215,9 @@ protected override void UpdateSelectedChunk(double y)
12121215
return;
12131216

12141217
var view = TextArea.TextView;
1218+
if (!view.VisualLinesValid)
1219+
return;
1220+
12151221
var lines = IsOld ? diff.Old : diff.New;
12161222
var selection = TextArea.Selection;
12171223
if (!selection.IsEmpty)

0 commit comments

Comments
 (0)