Skip to content
Open
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions ClangFormatEditor/DiffStyle/DiffMatchPatchWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,14 @@ private List<string> EqualizeDocumentLength(string input, string output)
if (newLineFoundPerOperation != 0)
{
emptyLinesToAdd += newLineFoundPerOperation;
if(emptyLinesToAdd > 0)
{
for (int i = 0; i < emptyLinesToAdd; i++)
{
lines.Add(Environment.NewLine);
}
}
emptyLinesToAdd = 0;
}
break;
case Operation.INSERT:
Expand Down Expand Up @@ -331,15 +339,6 @@ private List<string> EqualizeDocumentLength(string input, string output)
equalLines.RemoveAt(0);
}

// Insert empty lines to equalize the length of the input and output
if (newLineFoundPerOperation > 1)
{
for (int i = 0; i < emptyLinesToAdd; i++)
{
lines.Add(Environment.NewLine);
}
emptyLinesToAdd = 0;
}
lines.AddRange(equalLines);
break;
default:
Expand Down