Hold reference to JoinableTaskContext

jcansdale · jcansdale · commit c7a9185a36a4 · 2019-04-29T11:04:55.000+01:00
Simplify by holding a reference to JoinableTaskContext rather than JoinableTaskFactory.
diff --git a/src/GitHub.App/Authentication/TwoFactorChallengeHandler.cs b/src/GitHub.App/Authentication/TwoFactorChallengeHandler.cs
@@ -22,7 +22,7 @@ public class TwoFactorChallengeHandler : ReactiveObject, IDelegatingTwoFactorCha
         [ImportingConstructor]
         public TwoFactorChallengeHandler([Import(AllowDefault = true)] JoinableTaskContext joinableTaskContext)
         {            
-            JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;
+            JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;
         }
 
         ILogin2FaViewModel twoFactorDialog;
@@ -41,7 +41,7 @@ public async Task<TwoFactorChallengeResult> HandleTwoFactorException(TwoFactorAu
         {
             Guard.ArgumentNotNull(exception, nameof(exception));
 
-            await JoinableTaskFactory.SwitchToMainThreadAsync();
+            await JoinableTaskContext.Factory.SwitchToMainThreadAsync();
 
             var userError = new TwoFactorRequiredUserError(exception);
             var result = await twoFactorDialog.Show(userError);
@@ -58,10 +58,10 @@ public async Task<TwoFactorChallengeResult> HandleTwoFactorException(TwoFactorAu
 
         public async Task ChallengeFailed(Exception exception)
         {
-            await JoinableTaskFactory.SwitchToMainThreadAsync();
+            await JoinableTaskContext.Factory.SwitchToMainThreadAsync();
             twoFactorDialog.Cancel();
         }
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
     }
 }
diff --git a/src/GitHub.App/Factories/ModelServiceFactory.cs b/src/GitHub.App/Factories/ModelServiceFactory.cs
@@ -32,7 +32,7 @@ public ModelServiceFactory(
             this.apiClientFactory = apiClientFactory;
             this.hostCacheFactory = hostCacheFactory;
             this.avatarProvider = avatarProvider;
-            JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;
+            JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;
         }
 
         public async Task<IModelService> CreateAsync(IConnection connection)
@@ -63,11 +63,11 @@ await hostCacheFactory.Create(connection.HostAddress),
 
         public IModelService CreateBlocking(IConnection connection)
         {
-            return JoinableTaskFactory.Run(() => CreateAsync(connection));
+            return JoinableTaskContext.Factory.Run(() => CreateAsync(connection));
         }
 
         public void Dispose() => cacheLock.Dispose();
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
     }
 }
diff --git a/src/GitHub.App/Services/GitHubCredentialProvider.cs b/src/GitHub.App/Services/GitHubCredentialProvider.cs
@@ -24,7 +24,7 @@ public GitHubCredentialProvider(IKeychain keychain, [Import(AllowDefault = true)
             Guard.ArgumentNotNull(keychain, nameof(keychain));
 
             this.keychain = keychain;
-            JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;
+            JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;
         }
 
         /// <summary>
@@ -40,7 +40,7 @@ public Credentials HandleCredentials(string url, string username, SupportedCrede
 
             try
             {
-                var credentials = JoinableTaskFactory.Run(async () => await keychain.Load(host));
+                var credentials = JoinableTaskContext.Factory.Run(async () => await keychain.Load(host));
                 return new UsernamePasswordCredentials
                 {
                     Username = credentials.Item1,
@@ -54,6 +54,6 @@ public Credentials HandleCredentials(string url, string username, SupportedCrede
             }
         }
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
     }
 }
diff --git a/src/GitHub.App/Services/RepositoryCloneService.cs b/src/GitHub.App/Services/RepositoryCloneService.cs
@@ -60,7 +60,7 @@ public RepositoryCloneService(
             this.gitHubContextService = gitHubContextService;
             this.usageTracker = usageTracker;
             dte = new Lazy<EnvDTE.DTE>(() => sp.GetService<EnvDTE.DTE>());
-            JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;
+            JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;
 
             defaultClonePath = GetLocalClonePathFromGitProvider(operatingSystem.Environment.GetUserRepositoriesPath());
         }
@@ -212,7 +212,7 @@ public async Task CloneRepository(
             {
                 await TaskScheduler.Default;
                 operatingSystem.Directory.CreateDirectory(repositoryPath);
-                await JoinableTaskFactory.SwitchToMainThreadAsync();
+                await JoinableTaskContext.Factory.SwitchToMainThreadAsync();
             }
 
             try
@@ -253,7 +253,7 @@ string GetLocalClonePathFromGitProvider(string fallbackPath)
 
         public string DefaultClonePath { get { return defaultClonePath; } }
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
 
         class OrganizationAdapter
         {
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs
@@ -109,7 +109,7 @@ public PullRequestDetailViewModel(
             this.viewViewModelFactory = viewViewModelFactory;
             this.gitService = gitService;
             this.openDocumentCommand = openDocumentCommand;
-            JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;
+            JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;
 
             Files = files;
 
@@ -475,7 +475,7 @@ public override async Task Refresh()
         {
             try
             {
-                await JoinableTaskFactory.SwitchToMainThreadAsync();
+                await JoinableTaskContext.Factory.SwitchToMainThreadAsync();
 
                 Error = null;
                 OperationError = null;
@@ -739,6 +739,6 @@ public UpdateCommandState(
             public int SubmodulesToSync { get; }
         }
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
     }
 }
diff --git a/src/GitHub.VisualStudio/Services/LocalRepositories.cs b/src/GitHub.VisualStudio/Services/LocalRepositories.cs
@@ -26,15 +26,15 @@ public class LocalRepositories : ILocalRepositories
         public LocalRepositories(IVSGitServices vsGitServices, [Import(AllowDefault = true)] JoinableTaskContext joinableTaskContext)
         {
             this.vsGitServices = vsGitServices;
-            JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;
+            JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;
         }
 
         /// <inheritdoc/>
         public async Task Refresh()
         {
             await TaskScheduler.Default;
             var list = vsGitServices.GetKnownRepositories();
-            await JoinableTaskFactory.SwitchToMainThreadAsync();
+            await JoinableTaskContext.Factory.SwitchToMainThreadAsync();
 
             repositories.Except(list).ToList().ForEach(x => repositories.Remove(x));
             list.Except(repositories).ToList().ForEach(x => repositories.Add(x));
@@ -46,6 +46,6 @@ readonly ObservableCollectionEx<LocalRepositoryModel> repositories
         /// <inheritdoc/>
         public IReadOnlyObservableCollection<LocalRepositoryModel> Repositories => repositories;
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
     }
 }
diff --git a/src/GitHub.VisualStudio/Services/UsageService.cs b/src/GitHub.VisualStudio/Services/UsageService.cs
@@ -37,7 +37,7 @@ public UsageService(IGitHubServiceProvider serviceProvider, IEnvironment environ
         {
             this.serviceProvider = serviceProvider;
             this.environment = environment;
-            JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;
+            JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;
         }
 
         public void Dispose()
@@ -138,7 +138,7 @@ async Task Initialize()
         {
             if (storePath == null)
             {
-                await JoinableTaskFactory.SwitchToMainThreadAsync();
+                await JoinableTaskContext.Factory.SwitchToMainThreadAsync();
 
                 var program = serviceProvider.GetService<IProgram>();
 
@@ -190,6 +190,6 @@ class UserData
             public Guid UserGuid { get; set; }
         }
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
     }
 }
diff --git a/src/GitHub.VisualStudio/Services/UsageTracker.cs b/src/GitHub.VisualStudio/Services/UsageTracker.cs
@@ -36,7 +36,7 @@ public UsageTracker(
             this.gitHubServiceProvider = gitHubServiceProvider;
             this.service = service;
             this.userSettings = settings;
-            JoinableTaskFactory = joinableTaskContext.Factory;
+            JoinableTaskContext = joinableTaskContext;
             timer = StartTimer();
         }
 
@@ -70,7 +70,7 @@ async Task Initialize()
 
             // The services needed by the usage tracker are loaded when they are first needed to
             // improve the startup time of the extension.
-            await JoinableTaskFactory.SwitchToMainThreadAsync();
+            await JoinableTaskContext.Factory.SwitchToMainThreadAsync();
 
             client = gitHubServiceProvider.TryGetService<IMetricsService>();
             connectionManager = gitHubServiceProvider.GetService<IConnectionManager>();
@@ -143,6 +143,6 @@ async Task<UsageModel> GetCurrentReport(UsageData data)
             return current;
         }
 
-        JoinableTaskFactory JoinableTaskFactory { get; }
+        JoinableTaskContext JoinableTaskContext { get; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class TwoFactorChallengeHandler : ReactiveObject, IDelegatingTwoFactorCha`
`22`	`22`	`[ImportingConstructor]`
`23`	`23`	`public TwoFactorChallengeHandler([Import(AllowDefault = true)] JoinableTaskContext joinableTaskContext)`
`24`	`24`	`{`
`25`		`- JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;`
	`25`	`+ JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`ILogin2FaViewModel twoFactorDialog;`
`@@ -41,7 +41,7 @@ public async Task<TwoFactorChallengeResult> HandleTwoFactorException(TwoFactorAu`
`41`	`41`	`{`
`42`	`42`	`Guard.ArgumentNotNull(exception, nameof(exception));`
`43`	`43`
`44`		`- await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`44`	`+ await JoinableTaskContext.Factory.SwitchToMainThreadAsync();`
`45`	`45`
`46`	`46`	`var userError = new TwoFactorRequiredUserError(exception);`
`47`	`47`	`var result = await twoFactorDialog.Show(userError);`
`@@ -58,10 +58,10 @@ public async Task<TwoFactorChallengeResult> HandleTwoFactorException(TwoFactorAu`
`58`	`58`
`59`	`59`	`public async Task ChallengeFailed(Exception exception)`
`60`	`60`	`{`
`61`		`- await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`61`	`+ await JoinableTaskContext.Factory.SwitchToMainThreadAsync();`
`62`	`62`	`twoFactorDialog.Cancel();`
`63`	`63`	`}`
`64`	`64`
`65`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`65`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ModelServiceFactory(`
`32`	`32`	`this.apiClientFactory = apiClientFactory;`
`33`	`33`	`this.hostCacheFactory = hostCacheFactory;`
`34`	`34`	`this.avatarProvider = avatarProvider;`
`35`		`- JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;`
	`35`	`+ JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public async Task<IModelService> CreateAsync(IConnection connection)`
`@@ -63,11 +63,11 @@ await hostCacheFactory.Create(connection.HostAddress),`
`63`	`63`
`64`	`64`	`public IModelService CreateBlocking(IConnection connection)`
`65`	`65`	`{`
`66`		`- return JoinableTaskFactory.Run(() => CreateAsync(connection));`
	`66`	`+ return JoinableTaskContext.Factory.Run(() => CreateAsync(connection));`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public void Dispose() => cacheLock.Dispose();`
`70`	`70`
`71`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`71`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public GitHubCredentialProvider(IKeychain keychain, [Import(AllowDefault = true)`
`24`	`24`	`Guard.ArgumentNotNull(keychain, nameof(keychain));`
`25`	`25`
`26`	`26`	`this.keychain = keychain;`
`27`		`- JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;`
	`27`	`+ JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/// <summary>`
`@@ -40,7 +40,7 @@ public Credentials HandleCredentials(string url, string username, SupportedCrede`
`40`	`40`
`41`	`41`	`try`
`42`	`42`	`{`
`43`		`- var credentials = JoinableTaskFactory.Run(async () => await keychain.Load(host));`
	`43`	`+ var credentials = JoinableTaskContext.Factory.Run(async () => await keychain.Load(host));`
`44`	`44`	`return new UsernamePasswordCredentials`
`45`	`45`	`{`
`46`	`46`	`Username = credentials.Item1,`
`@@ -54,6 +54,6 @@ public Credentials HandleCredentials(string url, string username, SupportedCrede`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`57`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public RepositoryCloneService(`
`60`	`60`	`this.gitHubContextService = gitHubContextService;`
`61`	`61`	`this.usageTracker = usageTracker;`
`62`	`62`	`dte = new Lazy<EnvDTE.DTE>(() => sp.GetService<EnvDTE.DTE>());`
`63`		`- JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;`
	`63`	`+ JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;`
`64`	`64`
`65`	`65`	`defaultClonePath = GetLocalClonePathFromGitProvider(operatingSystem.Environment.GetUserRepositoriesPath());`
`66`	`66`	`}`
`@@ -212,7 +212,7 @@ public async Task CloneRepository(`
`212`	`212`	`{`
`213`	`213`	`await TaskScheduler.Default;`
`214`	`214`	`operatingSystem.Directory.CreateDirectory(repositoryPath);`
`215`		`- await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`215`	`+ await JoinableTaskContext.Factory.SwitchToMainThreadAsync();`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`try`
`@@ -253,7 +253,7 @@ string GetLocalClonePathFromGitProvider(string fallbackPath)`
`253`	`253`
`254`	`254`	`public string DefaultClonePath { get { return defaultClonePath; } }`
`255`	`255`
`256`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`256`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`257`	`257`
`258`	`258`	`class OrganizationAdapter`
`259`	`259`	`{`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public PullRequestDetailViewModel(`
`109`	`109`	`this.viewViewModelFactory = viewViewModelFactory;`
`110`	`110`	`this.gitService = gitService;`
`111`	`111`	`this.openDocumentCommand = openDocumentCommand;`
`112`		`- JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;`
	`112`	`+ JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;`
`113`	`113`
`114`	`114`	`Files = files;`
`115`	`115`
`@@ -475,7 +475,7 @@ public override async Task Refresh()`
`475`	`475`	`{`
`476`	`476`	`try`
`477`	`477`	`{`
`478`		`- await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`478`	`+ await JoinableTaskContext.Factory.SwitchToMainThreadAsync();`
`479`	`479`
`480`	`480`	`Error = null;`
`481`	`481`	`OperationError = null;`
`@@ -739,6 +739,6 @@ public UpdateCommandState(`
`739`	`739`	`public int SubmodulesToSync { get; }`
`740`	`740`	`}`
`741`	`741`
`742`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`742`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`743`	`743`	`}`
`744`	`744`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ public class LocalRepositories : ILocalRepositories`
`26`	`26`	`public LocalRepositories(IVSGitServices vsGitServices, [Import(AllowDefault = true)] JoinableTaskContext joinableTaskContext)`
`27`	`27`	`{`
`28`	`28`	`this.vsGitServices = vsGitServices;`
`29`		`- JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;`
	`29`	`+ JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/// <inheritdoc/>`
`33`	`33`	`public async Task Refresh()`
`34`	`34`	`{`
`35`	`35`	`await TaskScheduler.Default;`
`36`	`36`	`var list = vsGitServices.GetKnownRepositories();`
`37`		`- await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`37`	`+ await JoinableTaskContext.Factory.SwitchToMainThreadAsync();`
`38`	`38`
`39`	`39`	`repositories.Except(list).ToList().ForEach(x => repositories.Remove(x));`
`40`	`40`	`list.Except(repositories).ToList().ForEach(x => repositories.Add(x));`
`@@ -46,6 +46,6 @@ readonly ObservableCollectionEx<LocalRepositoryModel> repositories`
`46`	`46`	`/// <inheritdoc/>`
`47`	`47`	`public IReadOnlyObservableCollection<LocalRepositoryModel> Repositories => repositories;`
`48`	`48`
`49`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`49`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public UsageService(IGitHubServiceProvider serviceProvider, IEnvironment environ`
`37`	`37`	`{`
`38`	`38`	`this.serviceProvider = serviceProvider;`
`39`	`39`	`this.environment = environment;`
`40`		`- JoinableTaskFactory = joinableTaskContext?.Factory ?? ThreadHelper.JoinableTaskFactory;`
	`40`	`+ JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public void Dispose()`
`@@ -138,7 +138,7 @@ async Task Initialize()`
`138`	`138`	`{`
`139`	`139`	`if (storePath == null)`
`140`	`140`	`{`
`141`		`- await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`141`	`+ await JoinableTaskContext.Factory.SwitchToMainThreadAsync();`
`142`	`142`
`143`	`143`	`var program = serviceProvider.GetService<IProgram>();`
`144`	`144`
`@@ -190,6 +190,6 @@ class UserData`
`190`	`190`	`public Guid UserGuid { get; set; }`
`191`	`191`	`}`
`192`	`192`
`193`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`193`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`194`	`194`	`}`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public UsageTracker(`
`36`	`36`	`this.gitHubServiceProvider = gitHubServiceProvider;`
`37`	`37`	`this.service = service;`
`38`	`38`	`this.userSettings = settings;`
`39`		`- JoinableTaskFactory = joinableTaskContext.Factory;`
	`39`	`+ JoinableTaskContext = joinableTaskContext;`
`40`	`40`	`timer = StartTimer();`
`41`	`41`	`}`
`42`	`42`
`@@ -70,7 +70,7 @@ async Task Initialize()`
`70`	`70`
`71`	`71`	`// The services needed by the usage tracker are loaded when they are first needed to`
`72`	`72`	`// improve the startup time of the extension.`
`73`		`- await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`73`	`+ await JoinableTaskContext.Factory.SwitchToMainThreadAsync();`
`74`	`74`
`75`	`75`	`client = gitHubServiceProvider.TryGetService<IMetricsService>();`
`76`	`76`	`connectionManager = gitHubServiceProvider.GetService<IConnectionManager>();`
`@@ -143,6 +143,6 @@ async Task<UsageModel> GetCurrentReport(UsageData data)`
`143`	`143`	`return current;`
`144`	`144`	`}`
`145`	`145`
`146`		`- JoinableTaskFactory JoinableTaskFactory { get; }`
	`146`	`+ JoinableTaskContext JoinableTaskContext { get; }`
`147`	`147`	`}`
`148`	`148`	`}`