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

Commit 20879e7

Browse files
committed
Pass MainWindow to PullRequestStatusBarManager.Initialize
This will make it more conducive to testing.
1 parent dc81286 commit 20879e7

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Windows;
23
using System.Threading;
34
using System.Runtime.InteropServices;
45
using Microsoft.VisualStudio.Shell;
@@ -19,7 +20,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
1920
var componentModel = (IComponentModel)await GetServiceAsync(typeof(SComponentModel));
2021
var exportProvider = componentModel.DefaultExportProvider;
2122
var pullRequestStatusManager = exportProvider.GetExportedValue<IPullRequestStatusBarManager>();
22-
pullRequestStatusManager.Initialize();
23+
pullRequestStatusManager.Initialize(Application.Current.MainWindow);
2324
}
2425
}
2526
}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
namespace GitHub.InlineReviews.Services
1+
using System.Windows;
2+
3+
namespace GitHub.InlineReviews.Services
24
{
35
public interface IPullRequestStatusBarManager
46
{
5-
void Initialize();
7+
void Initialize(Window mainWindow);
68
}
79
}

src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public class PullRequestStatusBarManager : IPullRequestStatusBarManager
2525
const string StatusBarPartName = "PART_SccStatusBarHost";
2626

2727
readonly IVSGitExt gitExt;
28-
readonly Window mainWindow;
2928
readonly Lazy<IPullRequestSessionManager> pullRequestSessionManager;
3029
readonly IUsageTracker usageTracker;
3130
readonly IGitHubServiceProvider serviceProvider;
3231

32+
Window mainWindow;
3333
bool initialized;
3434

3535
[ImportingConstructor]
@@ -40,11 +40,11 @@ public PullRequestStatusBarManager(IVSGitExt gitExt, Lazy<IPullRequestSessionMan
4040
this.pullRequestSessionManager = pullRequestSessionManager;
4141
this.usageTracker = usageTracker;
4242
this.serviceProvider = serviceProvider;
43-
mainWindow = Application.Current.MainWindow;
4443
}
4544

46-
public void Initialize()
45+
public void Initialize(Window window)
4746
{
47+
mainWindow = window;
4848
TryInitialize();
4949
gitExt.ActiveRepositoriesChanged += TryInitialize;
5050
}

0 commit comments

Comments
 (0)