Skip to content

Commit c604ddb

Browse files
committed
fixes failing kezboard command registration introduced due to AsyncPackage rework
1 parent 68acb92 commit c604ddb

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

Source/SteroidsVS/Bootstrapper.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public void Run(IVsServiceProvider vsServiceProvider)
2020
RootContainer = new UnityContainer();
2121
Container = RootContainer;
2222

23+
Container.RegisterInstance(vsServiceProvider);
2324
Container.RegisterInstance(vsServiceProvider.ErrorList);
2425
Container.RegisterInstance(vsServiceProvider.OutliningManagerService);
2526
Container.RegisterInstance(vsServiceProvider.ComponentModel);

Source/SteroidsVS/CodeAdornments/CodeStructureOpenCommand.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
using System.ComponentModel.Design;
33
using System.Linq;
44
using System.Windows.Controls;
5+
using Microsoft.VisualStudio.Shell;
56
using Steroids.CodeStructure.Adorners;
67
using Steroids.CodeStructure.UI;
78
using Steroids.Contracts.Core;
9+
using Threading = System.Threading.Tasks;
810

911
namespace SteroidsVS.CodeAdornments
1012
{
@@ -35,6 +37,13 @@ public CodeStructureOpenCommand(
3537
throw new ArgumentNullException(nameof(vsServiceProvider));
3638
}
3739

40+
RegisterCommandAsync(vsServiceProvider).ConfigureAwait(false);
41+
}
42+
43+
private async Threading.Task RegisterCommandAsync(IVsServiceProvider vsServiceProvider)
44+
{
45+
await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
46+
3847
var commandService = vsServiceProvider.MenuCommandService;
3948
if (commandService != null)
4049
{

Source/SteroidsVS/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="97188178-f68c-49a6-9e5e-5fb99661bf09" Version="0.2.34" Language="en-US" Publisher="Erik Berthold" />
4+
<Identity Id="97188178-f68c-49a6-9e5e-5fb99661bf09" Version="0.2.35" Language="en-US" Publisher="Erik Berthold" />
55
<DisplayName>SteroidsVS</DisplayName>
66
<Description xml:space="preserve">Adds useful features to Visual Studio e.g. a nice code structure view.</Description>
77
<Icon>Assets\SteroidsVS_icon.png</Icon>

0 commit comments

Comments
 (0)