Changed to use IGitHubServiceProvider

Author: jcansdale

src/GitHub.App/Services/NavigationService.cs

@@ -4,21 +4,20 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TextManager.Interop;
-using IServiceProvider = System.IServiceProvider;
 using GitHub.Models;
 
 namespace GitHub.Services
 {
     [Export(typeof(INavigationService))]
     public class NavigationService : INavigationService
     {
-        readonly IServiceProvider serviceProvider;
+        readonly IGitHubServiceProvider serviceProvider;
 
         // If the target line doesn't have a unique match, search this number of lines above looking for a match.
         public const int MatchLinesAboveTarget = 4;
 
         [ImportingConstructor]
-        public NavigationService([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
+        public NavigationService(IGitHubServiceProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
         }
@@ -51,7 +50,7 @@ public IVsTextView NavigateToEquivalentPosition(IVsTextView sourceView, string t
 
         public IVsTextView FindActiveView()
         {
-            var textManager = (IVsTextManager2)serviceProvider.GetService(typeof(SVsTextManager));
+            var textManager = serviceProvider.GetService<SVsTextManager, IVsTextManager2>();
             IVsTextView view;
             var hresult = textManager.GetActiveView2(1, null, (uint)_VIEWFRAMETYPE.vftCodeWindow, out view);
             return hresult == VSConstants.S_OK ? view : null;

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

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using GitHub.Services;
 using NUnit.Framework;
 using NSubstitute;
@@ -18,8 +17,7 @@ public class TheFindNearestMatchingLineMethod
         public void FindNearestMatchingLine(IList<string> fromLines, IList<string> toLines, int line,
             int expectNearestLine, int expectMatchingLines)
         {
-            var sp = Substitute.For<IServiceProvider>();
-            var target = new NavigationService(sp);
+            var target = CreateNavigationService();
 
             int matchedLines;
             var nearestLine = target.FindNearestMatchingLine(fromLines, toLines, line, out matchedLines);
@@ -39,12 +37,17 @@ public class TheFindMatchingLineMethod
         public void FindNearestMatchingLine(IList<string> fromLines, IList<string> toLines, int line,
             int matchingLine)
         {
-            var sp = Substitute.For<IServiceProvider>();
-            var target = new NavigationService(sp);
+            var target = CreateNavigationService();
 
             var nearestLine = target.FindMatchingLine(fromLines, toLines, line);
 
             Assert.That(nearestLine, Is.EqualTo(matchingLine));
         }
     }
+
+    static NavigationService CreateNavigationService()
+    {
+        var sp = Substitute.For<IGitHubServiceProvider>();
+        return new NavigationService(sp);
+    }
 }