Remove legacy ResolvePath method

Everything now uses ResolveBlob.

Author: jcansdale

src/GitHub.App/Services/GitHubContextService.cs

@@ -237,70 +237,18 @@ public GitHubContext FindContextFromWindowTitle(string windowTitle)
 
         public bool TryOpenFile(string repositoryDir, GitHubContext context)
         {
-            var fileName = context.BlobName;
-            if (fileName == null)
+            var (commitish, path) = ResolveBlob(repositoryDir, context);
+            if (path == null)
             {
                 return false;
             }
 
-            string fullPath;
-            var resolvedPath = ResolvePath(context);
-            if (resolvedPath != null)
-            {
-                fullPath = Path.Combine(repositoryDir, resolvedPath);
-                if (!File.Exists(fullPath))
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                // Search by filename only
-                fullPath = Directory.EnumerateFiles(repositoryDir, fileName, SearchOption.AllDirectories).FirstOrDefault();
-                if (fullPath == null)
-                {
-                    return false;
-                }
-            }
-
+            var fullPath = Path.Combine(repositoryDir, path.Replace('/', '\\'));
             var textView = OpenDocument(fullPath);
-
             SetSelection(textView, context);
-
             return true;
         }
 
-        public string ResolvePath(GitHubContext context)
-        {
-            var treeish = context.TreeishPath;
-            if (treeish == null)
-            {
-                return null;
-            }
-
-            var blobName = context.BlobName;
-            if (blobName == null)
-            {
-                return null;
-            }
-
-            var match = treeishCommitRegex.Match(treeish);
-            if (match.Success)
-            {
-                var tree = match.Groups["tree"].Value.Replace('/', '\\');
-                return Path.Combine(tree, blobName);
-            }
-
-            match = treeishBranchRegex.Match(treeish);
-            if (match.Success)
-            {
-                var tree = match.Groups["tree"].Value.Replace('/', '\\');
-                return Path.Combine(tree, blobName);
-            }
-
-            return null;
-        }
-
         public (string commitish, string path) ResolveBlob(string repositoryDir, GitHubContext context)
         {
             Guard.ArgumentNotNull(repositoryDir, nameof(repositoryDir));

src/GitHub.Exports/Services/IGitHubContextService.cs

@@ -11,7 +11,6 @@ public interface IGitHubContextService
         GitHubContext FindContextFromUrl(string url);
         GitHubContext FindContextFromWindowTitle(string windowTitle);
         IEnumerable<string> FindWindowTitlesForClass(string className);
-        string ResolvePath(GitHubContext context);
         Uri ToRepositoryUrl(GitHubContext context);
         bool TryOpenFile(string repositoryDir, GitHubContext context);
         Task<bool> TryAnnotateFile(string repositoryDir, string currentBranch, GitHubContext context);

test/GitHub.App.UnitTests/Services/GitHubContextServiceTests.cs

@@ -350,27 +350,6 @@ public void ResolveBlob(string url, string commitish, string objectish, string e
         }
     }
 
-    public class TheResolvePathMethod
-    {
-        [TestCase("https://github.com/github/VisualStudio/blob/ee863ce265fc6217f589e66766125fed1b5b8256/foo.cs", "foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/ee863ce265fc6217f589e66766125fed1b5b8256/dir/foo.cs", @"dir\foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/ee863ce265fc6217f589e66766125fed1b5b8256/dir/subdir/foo.cs", @"dir\subdir\foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/master/foo.cs", "foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/master/dir/foo.cs", @"dir\foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/master/dir/subdir/foo.cs", @"dir\subdir\foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/unknown-branch/dir/subdir/foo.cs", null)]
-        [TestCase("https://github.com/github/VisualStudio/blob/unknown/branch/dir/subdir/foo.cs", null)]
-        public void ResolvePath(string url, string expectPath)
-        {
-            var target = CreateGitHubContextService();
-            var context = target.FindContextFromUrl(url);
-
-            var path = target.ResolvePath(context);
-
-            Assert.That(path, Is.EqualTo(expectPath));
-        }
-    }
-
     static GitHubContextService CreateGitHubContextService(string repositoryDir = null, IRepository repository = null)
     {
         var sp = Substitute.For<IGitHubServiceProvider>();