Merge pull request #2228 from github/fixes/2227-exclude-host-name-from-filter

Don't match host name when filtering repositories

Author: StanleyGoldman

src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs

@@ -178,14 +178,21 @@ bool FilterItem(object obj)
         {
             if (obj is IRepositoryItemViewModel item && !string.IsNullOrWhiteSpace(Filter))
             {
-                var urlString = item.Url.ToString();
-                var urlStringWithGit = urlString + ".git";
-                var urlStringWithSlash = urlString + "/";
-                return
-                    item.Caption.Contains(Filter, StringComparison.CurrentCultureIgnoreCase) ||
-                    urlString.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
-                    urlStringWithGit.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
-                    urlStringWithSlash.Contains(Filter, StringComparison.OrdinalIgnoreCase);
+                if (new UriString(Filter).IsHypertextTransferProtocol)
+                {
+                    var urlString = item.Url.ToString();
+                    var urlStringWithGit = urlString + ".git";
+                    var urlStringWithSlash = urlString + "/";
+                    return
+                        urlString.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
+                        urlStringWithGit.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
+                        urlStringWithSlash.Contains(Filter, StringComparison.OrdinalIgnoreCase);
+                }
+                else
+                {
+                    return
+                        item.Caption.Contains(Filter, StringComparison.CurrentCultureIgnoreCase);
+                }
             }
 
             return true;

test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositorySelectViewModelTests.cs

@@ -26,6 +26,7 @@ public class TheFilterProperty
         [TestCase("https://github.com/jcansdale/TestDriven.Net", "owner", "name", "https://github.com/jcansdale/TestDriven.Net-issues", 1)]
         [TestCase("https://github.com/owner/name/", "owner", "name", "https://github.com/owner/name", 1, Description = "Trailing slash")]
         [TestCase("https://github.com/owner/name.git", "owner", "name", "https://github.com/owner/name", 1, Description = "Trailing .git")]
+        [TestCase("github.com", "owner", "name", "https://github.com/owner/name", 0, Description = "Don't include host name in search")]
         public async Task Filter(string filter, string owner, string name, string url, int expectCount)
         {
             var contributedToRepositories = new[]