Skip to content

Async package #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 3 commits into from
Sep 19, 2019
Merged

Async package #11

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81f8b80
(WIP) migrate to asyncPackage
Thieum May 17, 2019
bbf8132
Working version on VS2019
Thieum May 17, 2019
ee5f1bd
fix warning C1998
Thieum May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions src/IndentGuidePackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using System.Threading;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Threading;

namespace IndentGuide {
[PackageRegistration(UseManagedResourcesOnly = true)]
[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
[InstalledProductRegistration("#110", "#112", "16", IconResourceID = 400)]
[ProvideMenuResource("Menus.ctmenu", 1)]
[ProvideOptionPage(typeof(DisplayOptions), "IndentGuide", "Display", 110, 120, false)]
Expand All @@ -37,31 +39,37 @@ namespace IndentGuide {
[ProvideService(typeof(SIndentGuide))]
[ResourceDescription("IndentGuidePackage")]
[Guid(Guids.IndentGuidePackageGuid)]
public sealed class IndentGuidePackage : Package {
public sealed class IndentGuidePackage : AsyncPackage {
private static readonly Guid guidIndentGuideCmdSet = Guid.Parse(Guids.IndentGuideCmdSetGuid);
private const int cmdidViewIndentGuides = 0x0103;

private EnvDTE.WindowEvents WindowEvents;
private IndentGuideService Service;
private bool CommandVisible;

protected override void Initialize() {
base.Initialize();
protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
{
await base.InitializeAsync(cancellationToken, progress);

JoinableTaskFactory = ThreadHelper.JoinableTaskFactory;

// Switches to the UI thread in order to consume some services used in command initialization
await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);

// Prepare event
var dte = GetService(typeof(EnvDTE.DTE)) as EnvDTE.DTE;
if (dte != null) {
var dte = await GetServiceAsync(typeof(EnvDTE.DTE)) as EnvDTE.DTE;
if (dte != null)
{
CommandVisible = false;
WindowEvents = dte.Events.WindowEvents;
WindowEvents.WindowActivated += WindowEvents_WindowActivated;
WindowEvents.WindowClosing += WindowEvents_WindowClosing;
}

// Add our command handlers for menu (commands must exist in the .vsct file)
var mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
if (mcs != null) {
var mcs = await GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
if (mcs != null)
{
// Create the command for the tool window
CommandID viewIndentCommandID = new CommandID(guidIndentGuideCmdSet, cmdidViewIndentGuides);
var menuCmd = new OleMenuCommand(ToggleVisibility, viewIndentCommandID);
Expand All @@ -71,9 +79,12 @@ protected override void Initialize() {
}

Service = new IndentGuideService(this);
((IServiceContainer)this).AddService(typeof(SIndentGuide), Service, true);
// Adds a service on the background thread
AddService(typeof(SIndentGuide), async (container, ct, type) => await System.Threading.Tasks.Task.FromResult(Service), true);

Service.Upgrade();
Service.Load();

}

protected override void Dispose(bool disposing) {
Expand Down Expand Up @@ -122,7 +133,7 @@ private void ToggleVisibility(object sender, EventArgs e) {

public static int Version { get { return CURRENT_VERSION; } }

public static JoinableTaskFactory JoinableTaskFactory { get; set; }
public new static JoinableTaskFactory JoinableTaskFactory { get; set; }

private static int GetCurrentVersion() {
var assembly = typeof(IndentGuideService).Assembly;
Expand Down