Skip to content

fix: handling of last line without newline in hunks #1907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2025
Merged

fix: handling of last line without newline in hunks #1907

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions src/Models/DiffResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public void GenerateNewPatchFromSelection(Change change, string fileBlobGuid, Te
var line = Lines[i];
if (line.Type != TextDiffLineType.Added)
continue;
writer.WriteLine($"+{line.Content}");
WriteLine(writer, '+', line);
}
}

Expand Down Expand Up @@ -257,16 +257,16 @@ public void GeneratePatchFromSelection(Change change, string fileTreeGuid, TextD
else if (line.Type == TextDiffLineType.Added)
{
if (revert)
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else if (line.Type == TextDiffLineType.Deleted)
{
if (!revert)
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else if (line.Type == TextDiffLineType.Normal)
{
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
}
}
Expand All @@ -282,15 +282,15 @@ public void GeneratePatchFromSelection(Change change, string fileTreeGuid, TextD
}
else if (line.Type == TextDiffLineType.Normal)
{
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else if (line.Type == TextDiffLineType.Added)
{
writer.WriteLine($"+{line.Content}");
WriteLine(writer, '+', line);
}
else if (line.Type == TextDiffLineType.Deleted)
{
writer.WriteLine($"-{line.Content}");
WriteLine(writer, '-', line);
}
}

Expand Down Expand Up @@ -380,16 +380,16 @@ public void GeneratePatchFromSelectionSingleSide(Change change, string fileTreeG
else if (line.Type == TextDiffLineType.Added)
{
if (revert)
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else if (line.Type == TextDiffLineType.Deleted)
{
if (!revert)
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else if (line.Type == TextDiffLineType.Normal)
{
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
}
}
Expand All @@ -405,15 +405,15 @@ public void GeneratePatchFromSelectionSingleSide(Change change, string fileTreeG
}
else if (line.Type == TextDiffLineType.Normal)
{
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else if (line.Type == TextDiffLineType.Added)
{
if (isOldSide)
{
if (revert)
{
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else
{
Expand All @@ -422,20 +422,20 @@ public void GeneratePatchFromSelectionSingleSide(Change change, string fileTreeG
}
else
{
writer.WriteLine($"+{line.Content}");
WriteLine(writer, '+', line);
}
}
else if (line.Type == TextDiffLineType.Deleted)
{
if (isOldSide)
{
writer.WriteLine($"-{line.Content}");
WriteLine(writer, '-', line);
}
else
{
if (!revert)
{
writer.WriteLine($" {line.Content}");
WriteLine(writer, ' ', line);
}
else
{
Expand Down Expand Up @@ -598,6 +598,14 @@ private bool ProcessIndicatorForPatchSingleSide(StreamWriter writer, TextDiffLin
return true;
}

private static void WriteLine(StreamWriter writer, char prefix, TextDiffLine line)
{
writer.WriteLine($"{prefix}{line.Content}");

if (line.NoNewLineEndOfFile)
writer.WriteLine("\\ No newline at end of file");
}

[GeneratedRegex(@"^@@ \-(\d+),?\d* \+(\d+),?\d* @@")]
private static partial Regex REG_INDICATOR();
}
Expand Down
Loading