Don't open folder when solution part of repository

Don't close solution and open folder view when solution is already in
the targeted repository.

Author: jcansdale

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -37,6 +38,7 @@ public class RepositoryCloneService : IRepositoryCloneService
         readonly IGraphQLClientFactory graphqlFactory;
         readonly IGitHubContextService gitHubContextService;
         readonly IUsageTracker usageTracker;
+        readonly Lazy<EnvDTE.DTE> dte;
         ICompiledQuery<ViewerRepositoriesModel> readViewerRepositories;
 
         [ImportingConstructor]
@@ -46,14 +48,16 @@ public RepositoryCloneService(
             ITeamExplorerServices teamExplorerServices,
             IGraphQLClientFactory graphqlFactory,
             IGitHubContextService gitHubContextService,
-            IUsageTracker usageTracker)
+            IUsageTracker usageTracker,
+            IGitHubServiceProvider sp)
         {
             this.operatingSystem = operatingSystem;
             this.vsGitServices = vsGitServices;
             this.teamExplorerServices = teamExplorerServices;
             this.graphqlFactory = graphqlFactory;
             this.gitHubContextService = gitHubContextService;
             this.usageTracker = usageTracker;
+            dte = new Lazy<EnvDTE.DTE>(() => sp.GetService<EnvDTE.DTE>());
 
             defaultClonePath = GetLocalClonePathFromGitProvider(operatingSystem.Environment.GetUserRepositoriesPath());
         }
@@ -127,7 +131,10 @@ public async Task CloneOrOpenRepository(
             var isDotCom = HostAddress.IsGitHubDotComUri(repositoryUrl);
             if (DestinationDirectoryExists(repositoryPath))
             {
-                teamExplorerServices.OpenRepository(repositoryPath);
+                if (!IsSolutionInRepository(repositoryPath))
+                {
+                    teamExplorerServices.OpenRepository(repositoryPath);
+                }
 
                 if (isDotCom)
                 {
@@ -164,6 +171,29 @@ public async Task CloneOrOpenRepository(
             }
         }
 
+        bool IsSolutionInRepository(string repositoryPath)
+        {
+            var solutionPath = dte.Value.Solution.FileName;
+            if (string.IsNullOrEmpty(solutionPath))
+            {
+                return false;
+            }
+
+            var isFolder = operatingSystem.Directory.DirectoryExists(solutionPath);
+            var solutionDir = isFolder ? solutionPath : Path.GetDirectoryName(solutionPath);
+            if (string.Equals(repositoryPath, solutionDir, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            if (solutionDir.StartsWith(repositoryPath + '\\', StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         /// <inheritdoc/>
         public async Task CloneRepository(
             string cloneUrl,

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

@@ -46,6 +46,36 @@ await usageTracker.Received(numberOfCalls).IncrementCounter(
                     ((MemberExpression)x.Body).Member.Name == counterName));
         }
 
+        [TestCase(@"c:\repository", "", true, 1)]
+        [TestCase(@"c:\repository", @"c:\solution", true, 1)]
+        [TestCase(@"c:\already\open", @"c:\already\open", true, 0)]
+        [TestCase(@"c:\already\open", @"c:\already\open\nested", true, 0, Description = "Solution folder in repository")]
+        [TestCase(@"c:\already\open", @"c:\already\open\my.sln", false, 0)]
+        [TestCase(@"c:\already\open", @"c:\already\open\nested\my.sln", false, 0)]
+        [TestCase(@"c:\already\open\nested", @"c:\already\open", true, 1, Description = "Repository in solution folder")]
+        public async Task Skip_OpenRepository_When_Already_Open(string repositoryPath, string solutionPath,
+            bool isFolder, int openRepository)
+        {
+            var repositoryUrl = "https://github.com/owner/repo";
+            var cloneDialogResult = new CloneDialogResult(repositoryPath, repositoryUrl);
+            var serviceProvider = Substitutes.GetServiceProvider();
+            var operatingSystem = serviceProvider.GetOperatingSystem();
+            operatingSystem.Directory.DirectoryExists(repositoryPath).Returns(true);
+            var dte = Substitute.For<EnvDTE.DTE>();
+            serviceProvider.GetService<EnvDTE.DTE>().Returns(dte);
+            dte.Solution.FileName.Returns(solutionPath);
+            if (isFolder)
+            {
+                operatingSystem.Directory.DirectoryExists(solutionPath).Returns(true);
+            }
+            var cloneService = CreateRepositoryCloneService(serviceProvider);
+
+            await cloneService.CloneOrOpenRepository(cloneDialogResult);
+
+            var teamExplorerServices = serviceProvider.GetTeamExplorerServices();
+            teamExplorerServices.Received(openRepository).OpenRepository(repositoryPath);
+        }
+
         [TestCase("https://github.com/foo/bar", false, 1, nameof(UsageModel.MeasuresModel.NumberOfClones))]
         [TestCase("https://github.com/foo/bar", false, 1, nameof(UsageModel.MeasuresModel.NumberOfGitHubClones))]
         [TestCase("https://github.com/foo/bar", false, 0, nameof(UsageModel.MeasuresModel.NumberOfEnterpriseClones))]
@@ -95,8 +125,7 @@ await usageTracker.Received(numberOfCalls).IncrementCounter(
         static RepositoryCloneService CreateRepositoryCloneService(IGitHubServiceProvider sp)
         {
             return new RepositoryCloneService(sp.GetOperatingSystem(), sp.GetVSGitServices(), sp.GetTeamExplorerServices(),
-                sp.GetGraphQLClientFactory(), sp.GetGitHubContextService(), sp.GetUsageTracker());
-
+                sp.GetGraphQLClientFactory(), sp.GetGitHubContextService(), sp.GetUsageTracker(), sp);
         }
     }
 }

test/GitHub.App.UnitTests/Substitutes.cs

@@ -113,14 +113,15 @@ public static IGitHubServiceProvider GetServiceProvider(
             var vsgit = IVSGitServices;
             var clone = cloneService ?? new RepositoryCloneService(os, vsgit, Substitute.For<ITeamExplorerServices>(),
                 Substitute.For<IGraphQLClientFactory>(), Substitute.For<IGitHubContextService>(),
-                Substitute.For<IUsageTracker>());
+                Substitute.For<IUsageTracker>(), ret);
             var create = creationService ?? new RepositoryCreationService(clone);
             avatarProvider = avatarProvider ?? Substitute.For<IAvatarProvider>();
             ret.GetService(typeof(IGitService)).Returns(gitservice);
             ret.GetService(typeof(IVSServices)).Returns(Substitute.For<IVSServices>());
             ret.GetService(typeof(ITeamExplorerServices)).Returns(Substitute.For<ITeamExplorerServices>());
             ret.GetService(typeof(IGraphQLClientFactory)).Returns(Substitute.For<IGraphQLClientFactory>());
             ret.GetService(typeof(IGitHubContextService)).Returns(Substitute.For<IGitHubContextService>());
+            ret.GetService(typeof(IVSGitExt)).Returns(Substitute.For<IVSGitExt>());
             ret.GetService(typeof(IUsageTracker)).Returns(Substitute.For<IUsageTracker>());
             ret.GetService(typeof(IVSGitServices)).Returns(vsgit);
             ret.GetService(typeof(IOperatingSystem)).Returns(os);
@@ -156,6 +157,11 @@ public static IGitHubContextService GetGitHubContextService(this IServiceProvide
             return provider.GetService(typeof(IGitHubContextService)) as IGitHubContextService;
         }
 
+        public static IVSGitExt GetVSGitExt(this IServiceProvider provider)
+        {
+            return provider.GetService(typeof(IVSGitExt)) as IVSGitExt;
+        }
+
         public static IUsageTracker GetUsageTracker(this IServiceProvider provider)
         {
             return provider.GetService(typeof(IUsageTracker)) as IUsageTracker;

test/GitHub.VisualStudio.UnitTests/Substitutes.cs

@@ -113,7 +113,7 @@ public static IGitHubServiceProvider GetServiceProvider(
             var vsgit = IVSGitServices;
             var clone = cloneService ?? new RepositoryCloneService(os, vsgit, Substitute.For<ITeamExplorerServices>(),
                 Substitute.For<IGraphQLClientFactory>(), Substitute.For<IGitHubContextService>(),
-                Substitute.For<IUsageTracker>());
+                Substitute.For<IUsageTracker>(), ret);
             var create = creationService ?? new RepositoryCreationService(clone);
             avatarProvider = avatarProvider ?? Substitute.For<IAvatarProvider>();
             ret.GetService(typeof(IGitService)).Returns(gitservice);