github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-23 10:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: better way to calculate length of commit subject

Browse Source 
- All empty line before valid commit message content will be ignored by git
- Whitespace at end-of-line will be ignored by git
- Whitespace at begining-of-line will be used by git
- For multiple-lines in subject, it will be replaced by single space by git when querying commit's subject

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-11-05 18:09:27 +08:00
parent 52ade74d67
commit 1dd2d1a6c8
1 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/Views/CommitMessageToolBox.axaml.cs
View File

@@ -143,20 +143,16 @@ namespace SourceGit.Views
lines.Sort((l, r) => l.StartOffset - r.StartOffset);
var lastSubjectLine = lines[0];
if (lastSubjectLine.StartOffset > SubjectLength)
return;
for (var i = 1; i < lines.Count; i++)
for (var i = 0; i < lines.Count; i++)
{
if (lines[i].StartOffset > SubjectLength)
break;
lastSubjectLine = lines[i];
var line = lines[i];
if (line.FirstDocumentLine.LineNumber == _subjectEndLine)
{
var y = line.GetTextLineVisualYPosition(line.TextLines[^1], VisualYPosition.LineBottom) - view.VerticalOffset + 4;
context.DrawLine(pen, new Point(0, y), new Point(w, y));
return;
}
}
var endY = lastSubjectLine.GetTextLineVisualYPosition(lastSubjectLine.TextLines[^1], VisualYPosition.LineBottom) - view.VerticalOffset + 4;
context.DrawLine(pen, new Point(0, endY), new Point(w, endY));
}
protected override void OnLoaded(RoutedEventArgs e)
@@ -184,38 +180,34 @@ namespace SourceGit.Views
if (!_isEditing)
Text = CommitMessage;
var chars = CommitMessage.ToCharArray();
var lastLinebreakIndex = 0;
var lastLinebreakCount = 0;
var lines = CommitMessage.ReplaceLineEndings("\n").Split('\n');
var subjectLen = 0;
var foundSubjectEnd = false;
for (var i = 0; i < chars.Length; i++)
{
var ch = chars[i];
if (ch == '\r')
continue;
if (ch == '\n')
for (var i = 0; i < lines.Length; i++)
{
var line = lines[i];
if (string.IsNullOrWhiteSpace(line))
{
if (lastLinebreakCount > 0)
{
SetCurrentValue(SubjectLengthProperty, lastLinebreakIndex);
foundSubjectEnd = true;
break;
}
else
{
lastLinebreakIndex = i;
lastLinebreakCount = 1;
}
if (subjectLen == 0)
continue;
_subjectEndLine = i;
foundSubjectEnd = true;
break;
}
var validCharLen = line.TrimEnd().Length;
if (subjectLen > 0)
subjectLen += (validCharLen + 1);
else
{
lastLinebreakCount = 0;
}
subjectLen = validCharLen;
}
if (!foundSubjectEnd)
SetCurrentValue(SubjectLengthProperty, CommitMessage?.Length ?? 0);
_subjectEndLine = lines.Length;
SetCurrentValue(SubjectLengthProperty, subjectLen);
}
}
@@ -325,6 +317,7 @@ namespace SourceGit.Views
private readonly List<string> _keywords = ["Acked-by: ", "Co-authored-by: ", "Reviewed-by: ", "Signed-off-by: ", "BREAKING CHANGE: "];
private bool _isEditing = false;
private int _subjectEndLine = 0;
private CompletionWindow _completionWnd = null;
}