Merge pull request #424 from gazab/fixes/generate-link-startline-endline-order

Fix url generation with startLine and endLine

Author: shana

src/GitHub.Exports/Models/SimpleRepositoryModel.cs

@@ -84,6 +84,20 @@ public UriString GenerateUrl(string path = null, int startLine = -1, int endLine
                     path = path.Substring(LocalPath.Length + 1);
             }
 
+            if (startLine > 0 && endLine > 0 && startLine > endLine)
+            {
+                // if startLine is greater than endLine and both are set, swap them
+                var temp = startLine;
+                startLine = endLine;
+                endLine = temp;
+            }
+
+            if (startLine == endLine)
+            {
+                // if startLine is the same as endLine don't generate a range link
+                endLine = -1;
+            }
+
             return new UriString(GenerateUrl(CloneUrl.ToRepositoryUrl().AbsoluteUri, sha, path, startLine, endLine));
         }
 

src/UnitTests/GitHub.Exports/SimpleRepositoryModelTests.cs

@@ -28,15 +28,19 @@ void SetupRepository(string sha)
     [Theory]
     [InlineData(false, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", -1, -1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs")]
     [InlineData(false, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 1, -1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1")]
+    [InlineData(false, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 1, 1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1")]
     [InlineData(false, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 1, 2, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1-L2")]
+    [InlineData(false, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 2, 1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1-L2")]
     [InlineData(false, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", -1, 2, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs")]
     [InlineData(false, "https://github.com/foo/bar", "123123", "", 1, 2, "https://github.com/foo/bar/commit/123123")]
     [InlineData(false, "https://github.com/foo/bar", "", @"src\dir\file1.cs", -1, 2, "https://github.com/foo/bar")]
     [InlineData(false, "https://github.com/foo/bar", null, null, -1, -1, "https://github.com/foo/bar")]
     [InlineData(false, null, "123123", @"src\dir\file1.cs", 1, 2, null)]
     [InlineData(true,  "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", -1, -1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs")]
     [InlineData(true, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 1, -1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1")]
+    [InlineData(true, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 1, 1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1")]
     [InlineData(true, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 1, 2, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1-L2")]
+    [InlineData(true, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", 2, 1, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs#L1-L2")]
     [InlineData(true, "https://github.com/foo/bar", "123123", @"src\dir\file1.cs", -1, 2, "https://github.com/foo/bar/blob/123123/src/dir/file1.cs")]
     [InlineData(true, "https://github.com/foo/bar", "", @"src\dir\file1.cs", -1, 2, "https://github.com/foo/bar")]
     [InlineData(true, null, "123123", @"src\dir\file1.cs", 1, 2, null)]