Merge branch 'master' into fixes/test

Author: jcansdale

README.md

@@ -2,13 +2,9 @@
 
 ## Notices
 
-### VS 2017 v15.3 users, please read
+### If you are having issues with the installer, please read
 
-If you need to downgrade or uninstall the extension, **do not use** ***Revert*** in Visual Studio 2017 15.3. Instead, manually uninstall the extension with the steps listed in https://github.com/github/VisualStudio/issues/1206#issuecomment-326558902
-
-If you have a corrupted extension cache, steps for fixing it are in https://github.com/github/VisualStudio/issues/1206#issuecomment-326053090
-
-The Visual Studio 2017 15.3 installer [has a bug](https://github.com/github/VisualStudio/issues/1206) that causes a corruption of the installed extensions data when you revert an installation of the extension (see also [this MS issue](https://developercommunity.visualstudio.com/content/problem/102178/error-installing-github-extension.html)). Until VS 2017 15.4 comes out, **do not use Revert in** ***Extensions and Updates***.
+If you need to upgrade, downgrade, or uninstall the extension, and are having problems doing so, refer to this issue: https://github.com/github/VisualStudio/issues/1394 which details common problems and solutions when using the installer.
 
 ### The location of the submodules has changed as of 31-01-2017
 

src/GitHub.Exports/Models/DiffUtilities.cs

@@ -13,6 +13,8 @@ public static class DiffUtilities
 
         public static IEnumerable<DiffChunk> ParseFragment(string diff)
         {
+            Guard.ArgumentNotNull(diff, nameof(diff));
+
             var reader = new LineReader(diff);
             string line;
             DiffChunk chunk = null;

src/GitHub.InlineReviews/Services/DiffService.cs

@@ -32,7 +32,15 @@ public async Task<IReadOnlyList<DiffChunk>> Diff(
             string path)
         {
             var patch = await gitClient.Compare(repo, baseSha, headSha, path);
-            return DiffUtilities.ParseFragment(patch).ToList();
+
+            if (patch != null)
+            {
+                return DiffUtilities.ParseFragment(patch).ToList();
+            }
+            else
+            {
+                return new DiffChunk[0];
+            }
         }
 
         /// <inheritdoc/>
@@ -44,7 +52,15 @@ public async Task<IReadOnlyList<DiffChunk>> Diff(
             byte[] contents)
         {
             var changes = await gitClient.CompareWith(repo, baseSha, headSha, path, contents);
-            return DiffUtilities.ParseFragment(changes.Patch).ToList();
+
+            if (changes?.Patch != null)
+            {
+                return DiffUtilities.ParseFragment(changes.Patch).ToList();
+            }
+            else
+            {
+                return new DiffChunk[0];
+            }
         }
     }
 }