Skip to content

fix: Copy in TextDiffView may lost the last line #1044

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

Closed
wants to merge 1 commit into from
Closed

fix: Copy in TextDiffView may lost the last line #1044

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
21 changes: 15 additions & 6 deletions src/Views/TextDiffView.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,17 +1034,26 @@ private void CopyWithoutIndicators()

if (i == startIdx && startPosition.Column > 1)
{
builder.AppendLine(line.Content.Substring(startPosition.Column - 1));
var content = line.Content.Substring(startPosition.Column - 1);
if (i == endIdx && endPosition.Column < line.Content.Length + 1)
builder.Append(content.Substring(0,
Math.Min(content.Length, endPosition.Column - startPosition.Column)));
else
builder.AppendLine(content);
continue;
}

if (i == endIdx && endPosition.Column < line.Content.Length)
if (i == endIdx)
{
builder.AppendLine(line.Content.Substring(0, endPosition.Column));
continue;
// Handle the last line specially
if (endPosition.Column > 1)
builder.Append(line.Content.Substring(0,
Math.Min(line.Content.Length, endPosition.Column - 1)));
else
builder.Append(line.Content);
}

builder.AppendLine(line.Content);
else
builder.AppendLine(line.Content);
}

App.CopyText(builder.ToString());
Expand Down
Loading