michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

enhance: only replace hunk data if needed

Browse source
This commit is contained in:
leo 2024-07-18 10:17:40 +08:00
parent 4b07a38e97
commit b2ed1b283a
No known key found for this signature in database
1 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/Views/TextDiffView.axaml.cs
View file

@ -29,6 +29,17 @@ namespace SourceGit.Views
public double Height { get; set; } = 0.0; public double Height { get; set; } = 0.0;
public int StartIdx { get; set; } = 0; public int StartIdx { get; set; } = 0;
public int EndIdx { get; set; } = 0; public int EndIdx { get; set; } = 0;
public bool ShouldReplace(TextViewHighlightChunk old)
{
if (old == null)
return true;
return Math.Abs(Y - old.Y) > 0.001 ||
Math.Abs(Height - old.Height) > 0.001 ||
StartIdx != old.StartIdx ||
EndIdx != old.EndIdx;
}
} }
public class ThemedTextDiffPresenter : TextEditor public class ThemedTextDiffPresenter : TextEditor
@ -214,6 +225,21 @@ namespace SourceGit.Views
} }
} }
protected void TrySetHighlightChunk(TextViewHighlightChunk chunk)
{
var old = HighlightChunk;
if (chunk == null)
{
if (old != null)
SetCurrentValue(HighlightChunkProperty, null);
return;
}
if (chunk.ShouldReplace(old))
SetCurrentValue(HighlightChunkProperty, chunk);
}
protected (int, int) FindRangeByIndex(List<Models.TextDiffLine> lines, int lineIdx) protected (int, int) FindRangeByIndex(List<Models.TextDiffLine> lines, int lineIdx)
{ {
var startIdx = -1; var startIdx = -1;
@ -598,7 +624,7 @@ namespace SourceGit.Views
if (!string.IsNullOrEmpty(SelectedText)) if (!string.IsNullOrEmpty(SelectedText))
{ {
SetCurrentValue(HighlightChunkProperty, null); TrySetHighlightChunk(null);
return; return;
} }
@ -622,14 +648,14 @@ namespace SourceGit.Views
if (lineIdx == -1) if (lineIdx == -1)
{ {
SetCurrentValue(HighlightChunkProperty, null); TrySetHighlightChunk(null);
return; return;
} }
var (startIdx, endIdx) = FindRangeByIndex(DiffData.Lines, lineIdx); var (startIdx, endIdx) = FindRangeByIndex(DiffData.Lines, lineIdx);
if (startIdx == -1) if (startIdx == -1)
{ {
SetCurrentValue(HighlightChunkProperty, null); TrySetHighlightChunk(null);
return; return;
} }
@ -643,14 +669,13 @@ namespace SourceGit.Views
endLine.GetTextLineVisualYPosition(endLine.TextLines[^1], VisualYPosition.TextBottom) - view.VerticalOffset: endLine.GetTextLineVisualYPosition(endLine.TextLines[^1], VisualYPosition.TextBottom) - view.VerticalOffset:
view.Bounds.Height; view.Bounds.Height;
var hightlight = new TextViewHighlightChunk() TrySetHighlightChunk(new TextViewHighlightChunk()
{ {
Y = rectStartY, Y = rectStartY,
Height = rectEndY - rectStartY, Height = rectEndY - rectStartY,
StartIdx = startIdx, StartIdx = startIdx,
EndIdx = endIdx, EndIdx = endIdx,
}; });
SetCurrentValue(HighlightChunkProperty, hightlight);
} }
} }
@ -982,14 +1007,14 @@ namespace SourceGit.Views
if (!string.IsNullOrEmpty(SelectedText)) if (!string.IsNullOrEmpty(SelectedText))
{ {
SetCurrentValue(HighlightChunkProperty, null); TrySetHighlightChunk(null);
return; return;
} }
var parentView = this.FindAncestorOfType<TextDiffView>(); var parentView = this.FindAncestorOfType<TextDiffView>();
if (parentView == null || parentView.DataContext == null) if (parentView == null || parentView.DataContext == null)
{ {
SetCurrentValue(HighlightChunkProperty, null); TrySetHighlightChunk(null);
return; return;
} }
@ -1015,14 +1040,14 @@ namespace SourceGit.Views
if (lineIdx == -1) if (lineIdx == -1)
{ {
SetCurrentValue(HighlightChunkProperty, null); TrySetHighlightChunk(null);
return; return;
} }
var (startIdx, endIdx) = FindRangeByIndex(lines, lineIdx); var (startIdx, endIdx) = FindRangeByIndex(lines, lineIdx);
if (startIdx == -1) if (startIdx == -1)
{ {
SetCurrentValue(HighlightChunkProperty, null); TrySetHighlightChunk(null);
return; return;
} }
@ -1036,14 +1061,13 @@ namespace SourceGit.Views
endLine.GetTextLineVisualYPosition(endLine.TextLines[^1], VisualYPosition.TextBottom) - view.VerticalOffset : endLine.GetTextLineVisualYPosition(endLine.TextLines[^1], VisualYPosition.TextBottom) - view.VerticalOffset :
view.Bounds.Height; view.Bounds.Height;
var hightlight = new TextViewHighlightChunk() TrySetHighlightChunk(new TextViewHighlightChunk()
{ {
Y = rectStartY, Y = rectStartY,
Height = rectEndY - rectStartY, Height = rectEndY - rectStartY,
StartIdx = textDiff.Lines.IndexOf(lines[startIdx]), StartIdx = textDiff.Lines.IndexOf(lines[startIdx]),
EndIdx = textDiff.Lines.IndexOf(lines[endIdx]), EndIdx = endIdx == lines.Count - 1 ? textDiff.Lines.Count - 1 : textDiff.Lines.IndexOf(lines[endIdx]),
}; });
SetCurrentValue(HighlightChunkProperty, hightlight);
} }
} }