Merge branch 'master' into pull-request-status-circle

Author: StanleyGoldman

Directory.Build.Props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Product>GitHub Extension for Visual Studio</Product>
-    <Version>2.7.0.0</Version>
+    <Version>2.8.0.0</Version>
     <Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: '2.7.0.{build}'
+version: '2.8.0.{build}'
 skip_tags: true
 install:
 - ps: |

src/GitHub.App/Services/DialogService.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
 using GitHub.Api;
+using GitHub.Exports;
 using GitHub.Extensions;
 using GitHub.Factories;
 using GitHub.Models;
@@ -38,7 +39,13 @@ public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection, str
             if (string.IsNullOrEmpty(url))
             {
                 var clipboardContext = gitHubContextService.FindContextFromClipboard();
-                url = clipboardContext?.Url;
+                switch (clipboardContext?.LinkType)
+                {
+                    case LinkType.Blob:
+                    case LinkType.Repository:
+                        url = clipboardContext?.Url;
+                        break;
+                }
             }
 
             var viewModel = factory.CreateViewModel<IRepositoryCloneViewModel>();

src/GitHub.App/Services/GitHubContextService.cs

@@ -124,7 +124,27 @@ public GitHubContext FindContextFromUrl(string url)
                 Url = uri
             };
 
-            var repositoryPrefix = uri.ToRepositoryUrl().ToString() + "/";
+            if (uri.Owner == null)
+            {
+                context.LinkType = LinkType.Unknown;
+                return context;
+            }
+
+            if (uri.RepositoryName == null)
+            {
+                context.LinkType = LinkType.Unknown;
+                return context;
+            }
+
+            var repositoryUrl = uri.ToRepositoryUrl().ToString();
+            if (string.Equals(url, repositoryUrl, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(url, repositoryUrl + ".git", StringComparison.OrdinalIgnoreCase))
+            {
+                context.LinkType = LinkType.Repository;
+                return context;
+            }
+
+            var repositoryPrefix = repositoryUrl + "/";
             if (!url.StartsWith(repositoryPrefix, StringComparison.OrdinalIgnoreCase))
             {
                 return context;

src/GitHub.Exports/Exports/ExportMetadata.cs

@@ -21,7 +21,8 @@ public enum LinkType
     {
         Unknown,
         Blob,
-        Blame
+        Blame,
+        Repository
     }
 
     /// <summary>

src/GitHub.VisualStudio/UI/GitHubPane.cs

@@ -82,7 +82,9 @@ protected override void Initialize()
             // Using JoinableTaskFactory from parent AsyncPackage. That way if VS shuts down before this
             // work is done, we won't risk crashing due to arbitrary work going on in background threads.
             var asyncPackage = (AsyncPackage)Package;
-            viewModelTask = asyncPackage.JoinableTaskFactory.RunAsync(() => InitializeAsync(asyncPackage));
+            JoinableTaskFactory = asyncPackage.JoinableTaskFactory;
+
+            viewModelTask = JoinableTaskFactory.RunAsync(() => InitializeAsync(asyncPackage));
         }
 
         public Task<IGitHubPaneViewModel> GetViewModelAsync() => viewModelTask.JoinAsync();
@@ -123,7 +125,7 @@ public override IVsSearchTask CreateSearch(uint dwCookie, IVsSearchQuery pSearch
 
             if (pane != null)
             {
-                return new SearchTask(pane, dwCookie, pSearchQuery, pSearchCallback);
+                return new SearchTask(JoinableTaskFactory, pane, dwCookie, pSearchQuery, pSearchCallback);
             }
 
             return null;
@@ -175,37 +177,38 @@ void UpdateSearchHost(bool enabled, string query)
             {
                 SearchHost.IsEnabled = enabled;
 
-                var searchString = SearchHost.SearchQuery?.SearchString;
-                if (searchString?.Trim() != query?.Trim())
+                if (SearchHost.SearchQuery?.SearchString != query)
                 {
-                    // SearchAsync will crash the process if we send it a duplicate string.
-                    // There is a SearchTrimsWhitespace setting that makes searched with leading or trailing
-                    // white-space appear as duplicates. We compare the query with trimmed white-space to avoid this.
-                    // https://github.com/github/VisualStudio/issues/1948
                     SearchHost.SearchAsync(query != null ? new SearchQuery(query) : null);
                 }
             }
         }
 
         class SearchTask : VsSearchTask
         {
+            readonly JoinableTaskFactory joinableTaskFactory;
             readonly IGitHubPaneViewModel viewModel;
 
             public SearchTask(
+                JoinableTaskFactory joinableTaskFactory,
                 IGitHubPaneViewModel viewModel,
                 uint dwCookie,
                 IVsSearchQuery pSearchQuery,
                 IVsSearchCallback pSearchCallback)
                 : base(dwCookie, pSearchQuery, pSearchCallback)
             {
+                this.joinableTaskFactory = joinableTaskFactory;
                 this.viewModel = viewModel;
             }
 
             protected override void OnStartSearch()
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
+                joinableTaskFactory.RunAsync(async () =>
+                {
+                    await joinableTaskFactory.SwitchToMainThreadAsync();
+                    viewModel.SearchQuery = SearchQuery.SearchString;
+                });
 
-                viewModel.SearchQuery = SearchQuery.SearchString;
                 base.OnStartSearch();
             }
 
@@ -224,5 +227,7 @@ public SearchQuery(string query)
 
             public uint GetTokens(uint dwMaxTokens, IVsSearchToken[] rgpSearchTokens) => 0;
         }
+
+        public JoinableTaskFactory JoinableTaskFactory { get; private set; }
     }
 }

src/GitHub.VisualStudio/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.7.0.0" Language="en-US" Publisher="GitHub, Inc" />
+    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.8.0.0" Language="en-US" Publisher="GitHub, Inc" />
     <DisplayName>GitHub Extension for Visual Studio</DisplayName>
     <Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
     <PackageId>GitHub.VisualStudio</PackageId>

src/common/SolutionInfo.cs

@@ -18,6 +18,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.7.0.0";
+        internal const string Version = "2.8.0.0";
     }
 }

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

@@ -133,7 +133,12 @@ public void Url_EqualTo(string url, string expectUrl)
             Assert.That(context.Url?.ToString(), Is.EqualTo(expectUrl));
         }
 
+        [TestCase("https://github.com/github/VisualStudio", LinkType.Repository)]
+        [TestCase("https://github.com/github/VisualStudio.git", LinkType.Repository)]
+        [TestCase("https://github.com/github/VisualStudio/unknown/master/README.md", LinkType.Unknown)]
         [TestCase("https://github.com/github/VisualStudio/blob/master/README.md", LinkType.Blob)]
+        [TestCase("https://github.com", LinkType.Unknown)]
+        [TestCase("https://github.com/github", LinkType.Unknown)]
         [TestCase("https://github.com/github/VisualStudio/unknown/master/README.md", LinkType.Unknown)]
         public void LinkType_EqualTo(string url, LinkType expectLinkType)
         {