Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 60b2a70

Browse files
shanashana
committed
Merge branch 'shana/new-menu-system' into feature/link-to-vs
2 parents 3df7b6c + 01b72b0 commit 60b2a70

File tree

11 files changed

+171
-21
lines changed

11 files changed

+171
-21
lines changed

‎src/GitHub.Exports/GitHub.Exports.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@
113113
<Compile Include="Services\GitService.cs" />
114114
<Compile Include="Services\IActiveDocument.cs" />
115115
<Compile Include="Services\IGitService.cs" />
116+
<Compile Include="Services\IMenuHandler.cs" />
117+
<Compile Include="Services\IMenuProvider.cs" />
116118
<Compile Include="Services\ITeamExplorerServiceHolder.cs" />
117119
<Compile Include="Services\Logger.cs" />
118120
<Compile Include="Services\Services.cs" />

‎src/GitHub.Exports/Services/IMenuHandler.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System;
2+
3+
namespace GitHub.VisualStudio
4+
{
5+
/// <summary>
6+
/// Interface for MEF exports implementing menu handlers
7+
/// (top level context, toolbar, etc)
8+
/// </summary>
9+
public interface IMenuHandler
10+
{
11+
Guid Guid { get; }
12+
int CmdId { get; }
13+
void Activate();
14+
}
15+
16+
/// <summary>
17+
/// Interface for MEF exports implementing menu handlers
18+
/// (top level context, toolbar, etc)
19+
/// Allows hiding the menu (requires vsct visibility flags)
20+
/// </summary>
21+
public interface IDynamicMenuHandler : IMenuHandler
22+
{
23+
bool CanShow();
24+
}
25+
}

‎src/GitHub.Exports/Services/IMenuProvider.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace GitHub.VisualStudio
5+
{
6+
/// <summary>
7+
/// Container for static and dynamic visibility menus (context, toolbar, top, etc)
8+
/// Get a reference to this via MEF and register the menus
9+
/// </summary>
10+
public interface IMenuProvider
11+
{
12+
/// <summary>
13+
/// Registered via AddTopLevelMenuItem
14+
/// </summary>
15+
IEnumerable<IMenuHandler> Menus { get; set; }
16+
17+
/// <summary>
18+
/// Registered via AddDynamicMenuItem
19+
/// </summary>
20+
IEnumerable<IDynamicMenuHandler> DynamicMenus { get; set; }
21+
}
22+
}

‎src/GitHub.Exports/Services/Services.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ public static IVsOutputWindowPane OutputWindowPane
8181
// ReSharper disable once SuspiciousTypeConversion.Global
8282
public static DTE2 Dte2 => Dte as DTE2;
8383

84+
public static IVsUIShell UIShell => GetGlobalService<SVsUIShell, IVsUIShell>();
85+
8486
public static IVsActivityLog GetActivityLog(this IServiceProvider provider)
8587
{
8688
return GetGlobalService<SVsActivityLog, IVsActivityLog>(provider);

‎src/GitHub.VisualStudio/Base/MenuBase.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System;
2+
3+
namespace GitHub.VisualStudio
4+
{
5+
public abstract class MenuBase
6+
{
7+
readonly IServiceProvider serviceProvider;
8+
protected IServiceProvider ServiceProvider { get { return serviceProvider; } }
9+
10+
protected MenuBase()
11+
{
12+
}
13+
14+
protected MenuBase(IServiceProvider serviceProvider)
15+
{
16+
this.serviceProvider = serviceProvider;
17+
}
18+
}
19+
}

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<StartArguments>/rootsuffix Exp</StartArguments>
2828
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
2929
<ZipPackageCompressionLevel>Normal</ZipPackageCompressionLevel>
30+
<OutputPath>..\..\build\$(Configuration)\</OutputPath>
3031
</PropertyGroup>
3132
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3233
<DebugSymbols>true</DebugSymbols>
@@ -39,7 +40,6 @@
3940
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
4041
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4142
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
42-
<OutputPath>..\..\build\$(Configuration)\</OutputPath>
4343
<CreateVsixContainer>True</CreateVsixContainer>
4444
<DeployExtension>True</DeployExtension>
4545
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -54,7 +54,6 @@
5454
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5555
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
5656
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
57-
<OutputPath>..\..\build\$(Configuration)\</OutputPath>
5857
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
5958
</PropertyGroup>
6059
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
@@ -67,7 +66,6 @@
6766
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6867
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
6968
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
70-
<OutputPath>..\..\build\Release\</OutputPath>
7169
<DeployExtension>False</DeployExtension>
7270
</PropertyGroup>
7371
<PropertyGroup Condition="$(Buildtype) == 'Internal'">
@@ -214,6 +212,10 @@
214212
<Compile Include="Base\TeamExplorerServiceHolder.cs" />
215213
<Compile Include="Converters\CountToVisibilityConverter.cs" />
216214
<Compile Include="Helpers\SharedDictionaryManager.cs" />
215+
<Compile Include="Menus\ShowGitHubPane.cs" />
216+
<Compile Include="Menus\AddConnection.cs" />
217+
<Compile Include="Base\MenuBase.cs" />
218+
<Compile Include="Menus\MenuProvider.cs" />
217219
<Compile Include="Properties\AssemblyInfo.cs" />
218220
<Compile Include="Base\TeamExplorerBase.cs" />
219221
<Compile Include="Base\TeamExplorerItemBase.cs" />

‎src/GitHub.VisualStudio/GitHubPackage.cs‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,26 @@ public GitHubPackage()
4444
public GitHubPackage(IServiceProvider serviceProvider)
4545
: base(serviceProvider)
4646
{
47-
4847
}
4948

5049
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions")]
5150
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals")]
5251
protected override void Initialize()
5352
{
53+
base.Initialize();
5454

55-
ServiceProvider.AddTopLevelMenuItem(GuidList.guidGitHubCmdSet, PkgCmdIDList.addConnectionCommand, (s, e) => StartFlow(UIControllerFlow.Authentication));
56-
ServiceProvider.AddTopLevelMenuItem(GuidList.guidGitHubCmdSet, PkgCmdIDList.showGitHubPaneCommand, (s, e) =>
57-
{
58-
var window = FindToolWindow(typeof(GitHubPane), 0, true);
59-
if (window?.Frame == null)
60-
throw new NotSupportedException("Cannot create tool window");
55+
var menus = ServiceProvider.GetExportedValue<IMenuProvider>();
56+
foreach (var menu in menus.Menus)
57+
ServiceProvider.AddTopLevelMenuItem(menu.Guid, menu.CmdId, (s, e) => menu.Activate());
6158

62-
var windowFrame = (IVsWindowFrame)window.Frame;
63-
ErrorHandler.ThrowOnFailure(windowFrame.Show());
64-
});
59+
foreach (var menu in menus.DynamicMenus)
60+
ServiceProvider.AddDynamicMenuItem(menu.Guid, menu.CmdId, menu.CanShow, menu.Activate);
6561
ServiceProvider.AddDynamicMenuItem(GuidList.guidContextMenuSet, PkgCmdIDList.getLinkCommand,
6662
IsValidGithubRepo,
6763
OpenRepoInBrowser);
6864
ServiceProvider.AddDynamicMenuItem(GuidList.guidContextMenuSet, PkgCmdIDList.copyLinkCommand,
6965
IsValidGithubRepo,
7066
CopyRepoLinkToClipboard);
71-
72-
base.Initialize();
7367
}
7468

7569
private void CopyRepoLinkToClipboard()
@@ -110,10 +104,5 @@ private void OpenRepoInBrowser()
110104
vsBrowserProvider.OpenUrl(new Uri(outputUri));
111105
}
112106

113-
void StartFlow(UIControllerFlow controllerFlow)
114-
{
115-
var uiProvider = ServiceProvider.GetExportedValue<IUIProvider>();
116-
uiProvider.RunUI(controllerFlow, null);
117-
}
118107
}
119108
}

‎src/GitHub.VisualStudio/Menus/AddConnection.cs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using Microsoft.VisualStudio.Shell;
2+
using System;
3+
using System.ComponentModel.Composition;
4+
using GitHub.Services;
5+
using GitHub.UI;
6+
using GitHub.Extensions;
7+
8+
namespace GitHub.VisualStudio.Menus
9+
{
10+
[Export(typeof(IMenuHandler))]
11+
[PartCreationPolicy(CreationPolicy.Shared)]
12+
public class AddConnection: MenuBase, IMenuHandler
13+
{
14+
[ImportingConstructor]
15+
public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
16+
: base(serviceProvider)
17+
{
18+
}
19+
20+
public Guid Guid { get { return GuidList.guidGitHubCmdSet; } }
21+
public int CmdId { get { return PkgCmdIDList.addConnectionCommand; } }
22+
23+
public void Activate()
24+
{
25+
StartFlow(UIControllerFlow.Authentication);
26+
}
27+
28+
void StartFlow(UIControllerFlow controllerFlow)
29+
{
30+
var uiProvider = ServiceProvider.GetExportedValue<IUIProvider>();
31+
uiProvider.RunUI(controllerFlow, null);
32+
}
33+
}
34+
}

‎src/GitHub.VisualStudio/Menus/MenuProvider.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System.Collections.Generic;
2+
using System.ComponentModel.Composition;
3+
4+
namespace GitHub.VisualStudio.Menus
5+
{
6+
[Export(typeof(IMenuProvider))]
7+
[PartCreationPolicy(CreationPolicy.Shared)]
8+
public class MenuProvider : IMenuProvider
9+
{
10+
[ImportMany]
11+
public IEnumerable<IMenuHandler> Menus { get; set; }
12+
13+
[ImportMany]
14+
public IEnumerable<IDynamicMenuHandler> DynamicMenus { get; set; }
15+
}
16+
}

‎src/GitHub.VisualStudio/Menus/ShowGitHubPane.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using GitHub.VisualStudio.UI;
2+
using System;
3+
using System.ComponentModel.Composition;
4+
5+
namespace GitHub.VisualStudio
6+
{
7+
[Export(typeof(IMenuHandler))]
8+
[PartCreationPolicy(CreationPolicy.Shared)]
9+
public class ShowGitHubPane: MenuBase, IMenuHandler
10+
{
11+
public Guid Guid { get { return GuidList.guidGitHubCmdSet; } }
12+
public int CmdId { get { return PkgCmdIDList.showGitHubPaneCommand; } }
13+
14+
public void Activate()
15+
{
16+
GitHubPane.Activate();
17+
}
18+
}
19+
}

0 commit comments

Comments
 (0)