GiTechLab
diff --git a/‎LibGit2Sharp/BlobExtensions.cs
Lines changed: 4 additions & 4 deletions b/‎LibGit2Sharp/BlobExtensions.cs
Lines changed: 4 additions & 4 deletions
diff --git a/‎LibGit2Sharp/Core/Utf8Marshaler.cs
Lines changed: 6 additions & 6 deletions b/‎LibGit2Sharp/Core/Utf8Marshaler.cs
Lines changed: 6 additions & 6 deletions
@@ -22,7 +22,7 @@ public static string GetContentText(this Blob blob, Encoding encoding = null)
         {
             Ensure.ArgumentNotNull(blob, "blob");
 
-            return ReadToEnd(blob.GetContentStream, encoding);
+            return ReadToEnd(blob.GetContentStream(), encoding);
         }
 
         /// <summary>
@@ -40,12 +40,12 @@ public static string GetContentText(this Blob blob, FilteringOptions filteringOp
             Ensure.ArgumentNotNull(blob, "blob");
             Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");
 
-            return ReadToEnd(() => blob.GetContentStream(filteringOptions), encoding);
+            return ReadToEnd(blob.GetContentStream(filteringOptions), encoding);
         }
 
-        private static string ReadToEnd(Func<Stream> streamProvider, Encoding encoding)
+        private static string ReadToEnd(Stream stream, Encoding encoding)
         {
-            using (var reader = new StreamReader(streamProvider(), encoding ?? Encoding.UTF8, encoding == null))
+            using (var reader = new StreamReader(stream, encoding ?? LaxUtf8Marshaler.Encoding, encoding == null))
             {
                 return reader.ReadToEnd();
             }
 
@@ -91,9 +91,9 @@ internal class LaxUtf8Marshaler : EncodingMarshaler
     {
         private static readonly LaxUtf8Marshaler staticInstance = new LaxUtf8Marshaler();
 
-        private static readonly Encoding encoding = new UTF8Encoding(false, false);
+        public static readonly Encoding Encoding = new UTF8Encoding(false, false);
 
-        public LaxUtf8Marshaler() : base(encoding)
+        public LaxUtf8Marshaler() : base(Encoding)
         { }
 
         public static ICustomMarshaler GetInstance(String cookie)
@@ -113,22 +113,22 @@ public override IntPtr MarshalManagedToNative(object managedObj)
 
         public static string FromNative(IntPtr pNativeData)
         {
-            return FromNative(encoding, pNativeData);
+            return FromNative(Encoding, pNativeData);
         }
 
         public static string FromNative(IntPtr pNativeData, int length)
         {
-            return FromNative(encoding, pNativeData, length);
+            return FromNative(Encoding, pNativeData, length);
         }
 
         public static string FromBuffer(byte[] buffer)
         {
-            return FromBuffer(encoding, buffer);
+            return FromBuffer(Encoding, buffer);
         }
 
         public static string FromBuffer(byte[] buffer, int length)
         {
-            return FromBuffer(encoding, buffer, length);
+            return FromBuffer(Encoding, buffer, length);
         }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static string GetContentText(this Blob blob, Encoding encoding = null)`
`22`	`22`	`{`
`23`	`23`	`Ensure.ArgumentNotNull(blob, "blob");`
`24`	`24`
`25`		`- return ReadToEnd(blob.GetContentStream, encoding);`
	`25`	`+ return ReadToEnd(blob.GetContentStream(), encoding);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/// <summary>`
`@@ -40,12 +40,12 @@ public static string GetContentText(this Blob blob, FilteringOptions filteringOp`
`40`	`40`	`Ensure.ArgumentNotNull(blob, "blob");`
`41`	`41`	`Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");`
`42`	`42`
`43`		`- return ReadToEnd(() => blob.GetContentStream(filteringOptions), encoding);`
	`43`	`+ return ReadToEnd(blob.GetContentStream(filteringOptions), encoding);`
`44`	`44`	`}`
`45`	`45`
`46`		`- private static string ReadToEnd(Func<Stream> streamProvider, Encoding encoding)`
	`46`	`+ private static string ReadToEnd(Stream stream, Encoding encoding)`
`47`	`47`	`{`
`48`		`- using (var reader = new StreamReader(streamProvider(), encoding ?? Encoding.UTF8, encoding == null))`
	`48`	`+ using (var reader = new StreamReader(stream, encoding ?? LaxUtf8Marshaler.Encoding, encoding == null))`
`49`	`49`	`{`
`50`	`50`	`return reader.ReadToEnd();`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ internal class LaxUtf8Marshaler : EncodingMarshaler`
`91`	`91`	`{`
`92`	`92`	`private static readonly LaxUtf8Marshaler staticInstance = new LaxUtf8Marshaler();`
`93`	`93`
`94`		`- private static readonly Encoding encoding = new UTF8Encoding(false, false);`
	`94`	`+ public static readonly Encoding Encoding = new UTF8Encoding(false, false);`
`95`	`95`
`96`		`- public LaxUtf8Marshaler() : base(encoding)`
	`96`	`+ public LaxUtf8Marshaler() : base(Encoding)`
`97`	`97`	`{ }`
`98`	`98`
`99`	`99`	`public static ICustomMarshaler GetInstance(String cookie)`
`@@ -113,22 +113,22 @@ public override IntPtr MarshalManagedToNative(object managedObj)`
`113`	`113`
`114`	`114`	`public static string FromNative(IntPtr pNativeData)`
`115`	`115`	`{`
`116`		`- return FromNative(encoding, pNativeData);`
	`116`	`+ return FromNative(Encoding, pNativeData);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public static string FromNative(IntPtr pNativeData, int length)`
`120`	`120`	`{`
`121`		`- return FromNative(encoding, pNativeData, length);`
	`121`	`+ return FromNative(Encoding, pNativeData, length);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public static string FromBuffer(byte[] buffer)`
`125`	`125`	`{`
`126`		`- return FromBuffer(encoding, buffer);`
	`126`	`+ return FromBuffer(Encoding, buffer);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`public static string FromBuffer(byte[] buffer, int length)`
`130`	`130`	`{`
`131`		`- return FromBuffer(encoding, buffer, length);`
	`131`	`+ return FromBuffer(Encoding, buffer, length);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`