Apply suggestions from code review

Author: Stijn-Rutten

LibGit2Sharp.Tests/DiffBlobToBlobFixture.cs

@@ -1,7 +1,7 @@
-using LibGit2Sharp.Tests.TestHelpers;
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Text;
+using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
 
 namespace LibGit2Sharp.Tests
@@ -227,6 +227,12 @@ public void DiffSetsTheAddedAndDeletedLinesCorrectly()
 
                 Assert.Single(changes.AddedLines);
                 Assert.Single(changes.DeletedLines);
+
+                Assert.Equal("4", changes.DeletedLines.First().Content);
+                Assert.Equal("5", changes.AddedLines.First().Content);
+
+                Assert.Equal(4, changes.DeletedLines.First().LineNumber);
+                Assert.Equal(4, changes.AddedLines.First().LineNumber);
             }
         }
 

LibGit2Sharp.Tests/DiffTreeToTargetFixture.cs

@@ -1,7 +1,7 @@
-using LibGit2Sharp.Tests.TestHelpers;
 using System.IO;
 using System.Linq;
 using System.Text;
+using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
 
 namespace LibGit2Sharp.Tests

LibGit2Sharp.Tests/DiffTreeToTreeFixture.cs

@@ -1,8 +1,8 @@
-using LibGit2Sharp.Tests.TestHelpers;
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
+using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
 
 namespace LibGit2Sharp.Tests

LibGit2Sharp/ContentChanges.cs

@@ -23,9 +23,6 @@ protected ContentChanges()
 
         internal unsafe ContentChanges(Repository repo, Blob oldBlob, Blob newBlob, GitDiffOptions options)
         {
-            AddedLines = new List<Line>();
-            DeletedLines = new List<Line>();
-
             Proxy.git_diff_blobs(repo.Handle,
                                  oldBlob != null ? oldBlob.Id : null,
                                  newBlob != null ? newBlob.Id : null,
@@ -58,13 +55,12 @@ internal void AppendToPatch(string patch)
         /// <summary>
         /// Lis of all lines added.
         /// </summary>
-        public virtual List<Line> AddedLines { get; internal set; }
+        public virtual List<Line> AddedLines { get; } = new List<Line>();
 
         /// <summary>
         /// List of all lines deleted.
         /// </summary>
-        public virtual List<Line> DeletedLines { get; internal set; }
-
+        public virtual List<Line> DeletedLines { get; } = new List<Line>();
 
         /// <summary>
         /// The patch corresponding to these changes.

LibGit2Sharp/Patch.cs

@@ -1,11 +1,11 @@
-using LibGit2Sharp.Core;
-using LibGit2Sharp.Core.Handles;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Text;
+using LibGit2Sharp.Core;
+using LibGit2Sharp.Core.Handles;
 
 namespace LibGit2Sharp
 {
@@ -68,11 +68,6 @@ private unsafe int PrintCallBack(git_diff_delta* delta, GitDiffHunk hunk, GitDif
             PatchEntryChanges currentChange = this[filePath];
             string prefix = string.Empty;
 
-            string decodedContent = LaxUtf8Marshaler.FromNative(line.content, (int)line.contentLen);
-
-            currentChange.AddedLines = currentChange.AddedLines ?? new List<Line>();
-            currentChange.DeletedLines = currentChange.DeletedLines ?? new List<Line>();
-
             switch (line.lineOrigin)
             {
                 case GitDiffLineOrigin.GIT_DIFF_LINE_CONTEXT:
@@ -82,14 +77,14 @@ private unsafe int PrintCallBack(git_diff_delta* delta, GitDiffHunk hunk, GitDif
                 case GitDiffLineOrigin.GIT_DIFF_LINE_ADDITION:
                     linesAdded++;
                     currentChange.LinesAdded++;
-                    currentChange.AddedLines.Add(new Line(line.NewLineNo, decodedContent));
+                    currentChange.AddedLines.Add(new Line(line.NewLineNo, patchPart));
                     prefix = "+";
                     break;
 
                 case GitDiffLineOrigin.GIT_DIFF_LINE_DELETION:
                     linesDeleted++;
                     currentChange.LinesDeleted++;
-                    currentChange.DeletedLines.Add(new Line(line.OldLineNo, decodedContent));
+                    currentChange.DeletedLines.Add(new Line(line.OldLineNo, patchPart));
                     prefix = "-";
                     break;
             }