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

Commit 5200e72

Browse files
committed
Rename InitializeTask to PendingTasks
PendingTasks is used to execute tasks in order on the thread pool.
1 parent 323f330 commit 5200e72

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/GitHub.TeamFoundation.14/Services/VSGitExt.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@ public VSGitExt(IGitHubServiceProvider serviceProvider, IVSUIContextFactory fact
4343
// It will become available when moving to a Git based solution (and cause a UIContext event to fire).
4444
context = factory.GetUIContext(new Guid(Guids.GitSccProviderId));
4545

46-
// Start with empty array until we have a change to initialize.
46+
// Start with empty array until we have a chance to initialize.
4747
ActiveRepositories = Array.Empty<ILocalRepositoryModel>();
4848

49-
InitializeTask = Task.CompletedTask;
50-
5149
if (context.IsActive && TryInitialize())
5250
{
5351
// Refresh ActiveRepositories on background thread so we don't delay startup.
@@ -97,8 +95,8 @@ bool TryInitialize()
9795

9896
void QueueRefreshActiveRepositories()
9997
{
100-
// Execute tasks in sequence on thread pool.
101-
InitializeTask = InitializeTask.ContinueWith(_ => RefreshActiveRepositories(), TaskScheduler.Default);
98+
// Execute tasks in sequence using thread pool (TaskScheduler.Default).
99+
PendingTasks = PendingTasks.ContinueWith(_ => RefreshActiveRepositories(), TaskScheduler.Default);
102100
}
103101

104102
void RefreshActiveRepositories()
@@ -139,6 +137,9 @@ private set
139137

140138
public event Action ActiveRepositoriesChanged;
141139

142-
public Task InitializeTask { get; private set; }
140+
/// <summary>
141+
/// Tasks that are pending execution on the thread pool.
142+
/// </summary>
143+
public Task PendingTasks { get; private set; } = Task.CompletedTask;
143144
}
144145
}

test/UnitTests/GitHub.TeamFoundation/VSGitExtTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public async Task GitExtPropertyChangedEvent_ActiveRepositoriesChangedIsFired()
7575
var eventArgs = new PropertyChangedEventArgs(nameof(gitExt.ActiveRepositories));
7676
gitExt.PropertyChanged += Raise.Event<PropertyChangedEventHandler>(gitExt, eventArgs);
7777

78-
await target.InitializeTask;
78+
await target.PendingTasks;
7979
Assert.That(wasFired, Is.True);
8080
}
8181

@@ -109,7 +109,7 @@ public void WhenUIContextChanged_ActiveRepositoriesChangedIsFired()
109109

110110
var eventArgs = new VSUIContextChangedEventArgs(true);
111111
context.UIContextChanged += Raise.Event<EventHandler<VSUIContextChangedEventArgs>>(context, eventArgs);
112-
target.InitializeTask.Wait();
112+
target.PendingTasks.Wait();
113113

114114
Assert.That(wasFired, Is.True);
115115
}
@@ -126,7 +126,7 @@ public void WhenUIContextChanged_FiredUsingThreadPoolThread()
126126

127127
var eventArgs = new VSUIContextChangedEventArgs(true);
128128
context.UIContextChanged += Raise.Event<EventHandler<VSUIContextChangedEventArgs>>(context, eventArgs);
129-
target.InitializeTask.Wait();
129+
target.PendingTasks.Wait();
130130

131131
Assert.That(threadPool, Is.True);
132132
}
@@ -151,7 +151,7 @@ public void SccProviderContextIsActive_InitializeWithActiveRepositories()
151151
var context = CreateVSUIContext(true);
152152
var gitExt = CreateGitExt(new[] { repoPath });
153153
var target = CreateVSGitExt(context, gitExt, repoFactory: repoFactory);
154-
target.InitializeTask.Wait();
154+
target.PendingTasks.Wait();
155155

156156
var activeRepositories = target.ActiveRepositories;
157157

@@ -168,7 +168,7 @@ public void ExceptionRefreshingRepositories_ReturnsEmptyList()
168168
var context = CreateVSUIContext(true);
169169
var gitExt = CreateGitExt(new[] { repoPath });
170170
var target = CreateVSGitExt(context, gitExt, repoFactory: repoFactory);
171-
target.InitializeTask.Wait();
171+
target.PendingTasks.Wait();
172172

173173
var activeRepositories = target.ActiveRepositories;
174174

@@ -189,7 +189,7 @@ public async Task ActiveRepositoriesChangedOrderingShouldBeCorrectAcrossThreads(
189189
var task2 = Task.Run(() => gitExt.ActiveRepositories = activeRepositories2);
190190

191191
await Task.WhenAll(task1, task2);
192-
await target.InitializeTask;
192+
await target.PendingTasks;
193193

194194
Assert.That(target.ActiveRepositories.Single().LocalPath, Is.EqualTo("repo2"));
195195
}
@@ -221,7 +221,7 @@ static VSGitExt CreateVSGitExt(IVSUIContext context = null, IGitExt gitExt = nul
221221
sp.GetService<IVSUIContextFactory>().Returns(factory);
222222
sp.GetService<IGitExt>().Returns(gitExt);
223223
var vsGitExt = new VSGitExt(sp, factory, repoFactory);
224-
vsGitExt.InitializeTask.Wait();
224+
vsGitExt.PendingTasks.Wait();
225225
return vsGitExt;
226226
}
227227

0 commit comments

Comments
 (0)