Merge pull request #112 from github/feature/pr/menu-refactoring

Turn menu creation methods into extension methods

Author: haacked

src/GitHub.Exports/Extensions/VSExtensions.cs

@@ -1,11 +1,17 @@
 using System;
+using System.ComponentModel.Design;
 using System.Diagnostics;
+using GitHub.Primitives;
 using GitHub.Services;
+using LibGit2Sharp;
 using Microsoft.TeamFoundation.Controls;
+using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 
 namespace GitHub.Extensions
 {
-    public static class VSExtensions
+    public static class IServiceProviderExtensions
     {
         static IUIProvider cachedUIProvider = null;
 
@@ -75,5 +81,54 @@ static T GetExportedValueAndCache<T, CacheType>(ref CacheType cache)
                 cache = (CacheType)(object)ret;
             return ret;
         }
+
+        public static void AddTopLevelMenuItem(this IServiceProvider provider,
+            Guid guid,
+            int cmdId,
+            EventHandler eventHandler)
+        {
+            var mcs = provider.GetService(typeof(IMenuCommandService)) as IMenuCommandService;
+            Debug.Assert(mcs != null, "No IMenuCommandService? Something is wonky");
+            if (mcs == null)
+                return;
+            var id = new CommandID(guid, cmdId);
+            var item = new MenuCommand(eventHandler, id);
+            mcs.AddCommand(item);
+        }
+
+        public static void AddDynamicMenuItem(this IServiceProvider provider,
+            Guid guid,
+            int cmdId,
+            Func<bool> canEnable,
+            Action execute)
+        {
+            var mcs = provider.GetService(typeof(IMenuCommandService)) as IMenuCommandService;
+            Debug.Assert(mcs != null, "No IMenuCommandService? Something is wonky");
+            if (mcs == null)
+                return;
+            var id = new CommandID(guid, cmdId);
+            var item = new OleMenuCommand(
+                (s, e) => execute(),
+                (s, e) => { },
+                (s, e) =>
+                {
+                    ((OleMenuCommand)s).Visible = canEnable();
+                },
+                id);
+            mcs.AddCommand(item);
+        }
+    }
+
+    public static class ISolutionExtensions
+    {
+        public static IRepository GetRepoFromSolution(this IVsSolution solution)
+        {
+            string solutionDir, solutionFile, userFile;
+            if (!ErrorHandler.Succeeded(solution.GetSolutionInfo(out solutionDir, out solutionFile, out userFile)))
+                return null;
+            if (solutionDir == null)
+                return null;
+            return GitService.GitServiceHelper.GetRepo(solutionDir);
+        }
     }
 }

src/GitHub.Exports/Services/Services.cs

@@ -100,15 +100,5 @@ public static UriString GetRepoUrlFromSolution(IVsSolution solution)
                 return null;
             return GitService.GitServiceHelper.GetUri(solutionDir);
         }
-
-        public static IRepository GetRepoFromSolution(this IVsSolution solution)
-        {
-            string solutionDir, solutionFile, userFile;
-            if (!ErrorHandler.Succeeded(solution.GetSolutionInfo(out solutionDir, out solutionFile, out userFile)))
-                return null;
-            if (solutionDir == null)
-                return null;
-            return GitService.GitServiceHelper.GetRepo(solutionDir);
-        }
     }
 }

src/GitHub.VisualStudio/Base/PackageBase.cs

@@ -24,58 +24,5 @@ protected PackageBase(IServiceProvider serviceProvider)
         {
             ServiceProvider = serviceProvider;
         }
-
-        protected void AddTopLevelMenuItem(
-            Guid guid,
-            uint packageCommandId,
-            EventHandler eventHandler)
-        {
-            var mcs = GetService(typeof(IMenuCommandService)) as IMenuCommandService;
-            Debug.Assert(mcs != null, "No IMenuCommandService? Something is wonky");
-            if (mcs == null)
-                return;
-            var cmdId = new CommandID(guid, (int)packageCommandId);
-            var item = new MenuCommand(eventHandler, cmdId);
-            mcs.AddCommand(item);
-        }
-
-        protected void AddDynamicMenuItem(
-            Guid guid,
-            uint id,
-            Func<bool> canEnable,
-            Action execute)
-        {
-            var mcs = GetService(typeof(IMenuCommandService)) as IMenuCommandService;
-            Debug.Assert(mcs != null, "No IMenuCommandService? Something is wonky");
-            if (mcs == null)
-                return;
-            var cmdId = new CommandID(guid, (int)id);
-            var item = new OleMenuCommand(
-                (s, e) => execute(),
-                (s, e) => { },
-                (s, e) =>
-                {
-                    ((OleMenuCommand)s).Visible = canEnable();
-                },
-                cmdId);
-            mcs.AddCommand(item);
-        }
-
-        public T GetService<T>()
-        {
-            Debug.Assert(this.serviceProvider != null, "GetService<T> called before service provider is set");
-            if (serviceProvider == null)
-                return default(T);
-            return (T)serviceProvider.GetService(typeof(T));
-        }
-
-        public T GetExportedValue<T>()
-        {
-            var componentModel = (IComponentModel)GetService<SComponentModel>();
-            if (componentModel == null)
-                return default(T);
-            var exportProvider = componentModel.DefaultExportProvider;
-            return exportProvider.GetExportedValue<T>();
-        }
     }
 }

src/GitHub.VisualStudio/GitHub.VisualStudio.vsct

@@ -64,7 +64,6 @@
       <IDSymbol name="GitHubMenu" value="0x1010"/>
       <IDSymbol name="idGitHubMenuGroup" value="0x1020"/>
       <IDSymbol name="addConnectionCommand" value="0x110"/>
-      <IDSymbol name="addConnectionCommandDark" value="0x111"/>
     </GuidSymbol>
 
     <!-- This is the Manage Connections menu -->

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -47,9 +47,10 @@ public GitHubPackage(IServiceProvider serviceProvider)
 
         protected override void Initialize()
         {
+
             base.Initialize();
 
-            AddTopLevelMenuItem(GuidList.guidGitHubCmdSet, PkgCmdIDList.addConnectionCommand, (s, e) => StartFlow(UIControllerFlow.Authentication));
+            ServiceProvider.AddTopLevelMenuItem(GuidList.guidGitHubCmdSet, PkgCmdIDList.addConnectionCommand, (s, e) => StartFlow(UIControllerFlow.Authentication));
         }
 
         void StartFlow(UIControllerFlow controllerFlow)

src/GitHub.VisualStudio/PkgCmdID.cs

@@ -4,7 +4,6 @@ namespace GitHub.VisualStudio
 {
     static class PkgCmdIDList
     {
-        public const uint addConnectionCommand = 0x110;
-        public const uint addConnectionCommandDark = 0x111;
+        public const int addConnectionCommand = 0x110;
     };
 }