Update new IDiagnosticAnalyzerService methods to be async.

src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Analyzer/AnalyzerSettingsProvider.cs

@@ -5,12 +5,13 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.IO;
 using System.Linq;
-using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.EditorConfig;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.PooledObjects;
@@ -22,31 +23,34 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Analyz
 internal sealed class AnalyzerSettingsProvider : SettingsProviderBase<AnalyzerSetting, AnalyzerSettingsUpdater, AnalyzerSetting, ReportDiagnostic>
 {
     public AnalyzerSettingsProvider(
+        IThreadingContext threadingContext,
         string fileName,
         AnalyzerSettingsUpdater settingsUpdater,
         Workspace workspace,
         IGlobalOptionService optionService)
-        : base(fileName, settingsUpdater, workspace, optionService)
+        : base(threadingContext, fileName, settingsUpdater, workspace, optionService)
     {
         Update();
     }
 
-    protected override void UpdateOptions(
-        TieredAnalyzerConfigOptions options, Solution solution, ImmutableArray<Project> projectsInScope)
+    protected override async Task UpdateOptionsAsync(
+        TieredAnalyzerConfigOptions options, Solution solution, ImmutableArray<Project> projectsInScope, CancellationToken cancellationToken)
     {
         var analyzerReferences = RoslynEnumerableExtensions.DistinctBy(projectsInScope.SelectMany(p => p.AnalyzerReferences), a => a.Id).ToImmutableArray();
         foreach (var analyzerReference in analyzerReferences)
         {
-            var configSettings = GetSettings(solution, analyzerReference, options.EditorConfigOptions);
+            var configSettings = await GetSettingsAsync(
+                solution, analyzerReference, options.EditorConfigOptions, cancellationToken).ConfigureAwait(false);
             AddRange(configSettings);
         }
     }
 
-    private ImmutableArray<AnalyzerSetting> GetSettings(
-        Solution solution, AnalyzerReference analyzerReference, AnalyzerConfigOptions editorConfigOptions)
+    private async Task<ImmutableArray<AnalyzerSetting>> GetSettingsAsync(
+        Solution solution, AnalyzerReference analyzerReference, AnalyzerConfigOptions editorConfigOptions, CancellationToken cancellationToken)
     {
         var service = solution.Services.GetRequiredService<IDiagnosticAnalyzerService>();
-        var map = service.GetDiagnosticDescriptors(solution, analyzerReference);
+        var map = await service.GetDiagnosticDescriptorsAsync(
+            solution, analyzerReference, cancellationToken).ConfigureAwait(false);
 
         using var _ = ArrayBuilder<AnalyzerSetting>.GetInstance(out var allSettings);
 

src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Analyzer/AnalyzerSettingsProviderFactory.cs

@@ -4,17 +4,19 @@
 
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Options;
 
 namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Analyzer;
 
 internal sealed class AnalyzerSettingsProviderFactory(
+    IThreadingContext threadingContext,
     Workspace workspace,
     IGlobalOptionService globalOptionService) : IWorkspaceSettingsProviderFactory<AnalyzerSetting>
 {
     public ISettingsProvider<AnalyzerSetting> GetForFile(string filePath)
     {
         var updater = new AnalyzerSettingsUpdater(workspace, filePath);
-        return new AnalyzerSettingsProvider(filePath, updater, workspace, globalOptionService);
+        return new AnalyzerSettingsProvider(threadingContext, filePath, updater, workspace, globalOptionService);
     }
 }

src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Analyzer/AnalyzerSettingsWorkspaceServiceFactory.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Composition;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
@@ -15,8 +16,9 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Analyz
 [method: ImportingConstructor]
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
 internal sealed class AnalyzerSettingsWorkspaceServiceFactory(
+    IThreadingContext threadingContext,
     IGlobalOptionService globalOptionService) : IWorkspaceServiceFactory
 {
     public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        => new AnalyzerSettingsProviderFactory(workspaceServices.Workspace, globalOptionService);
+        => new AnalyzerSettingsProviderFactory(threadingContext, workspaceServices.Workspace, globalOptionService);
 }

src/EditorFeatures/Core/EditorConfigSettings/DataProvider/NamingStyles/NamingStyleSettingsProvider.cs

@@ -5,26 +5,34 @@
 using System;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Options;
 using RoslynEnumerableExtensions = Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Extensions.EnumerableExtensions;
 
 namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.NamingStyles;
 
 internal sealed class NamingStyleSettingsProvider : SettingsProviderBase<NamingStyleSetting, NamingStyleSettingsUpdater, (Action<(object, object?)>, NamingStyleSetting), object>
 {
-    public NamingStyleSettingsProvider(string fileName, NamingStyleSettingsUpdater settingsUpdater, Workspace workspace, IGlobalOptionService globalOptions)
-        : base(fileName, settingsUpdater, workspace, globalOptions)
+    public NamingStyleSettingsProvider(
+        IThreadingContext threadingContext,
+        string fileName,
+        NamingStyleSettingsUpdater settingsUpdater,
+        Workspace workspace,
+        IGlobalOptionService globalOptions)
+        : base(threadingContext, fileName, settingsUpdater, workspace, globalOptions)
     {
         Update();
     }
 
-    protected override void UpdateOptions(
-        TieredAnalyzerConfigOptions options, Solution solution, ImmutableArray<Project> projectsInScope)
+    protected override Task UpdateOptionsAsync(
+        TieredAnalyzerConfigOptions options, Solution solution, ImmutableArray<Project> projectsInScope, CancellationToken cancellationToken)
     {
         options.GetInitialLocationAndValue<NamingStylePreferences>(NamingStyleOptions.NamingPreferences, out var location, out var namingPreferences);
 
@@ -33,5 +41,6 @@ protected override void UpdateOptions(
         var namingStyles = namingPreferences.Rules.NamingRules.Select(namingRule => new NamingStyleSetting(namingRule, allStyles, SettingsUpdater, fileName));
 
         AddRange(namingStyles);
+        return Task.CompletedTask;
     }
 }

src/EditorFeatures/Core/EditorConfigSettings/DataProvider/NamingStyles/NamingStyleSettingsProviderFactory.cs

@@ -4,18 +4,19 @@
 
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Options;
 
 namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.NamingStyles;
 
-internal sealed class NamingStyleSettingsProviderFactory(Workspace workspace, IGlobalOptionService globalOptions) : IWorkspaceSettingsProviderFactory<NamingStyleSetting>
+internal sealed class NamingStyleSettingsProviderFactory(
+    IThreadingContext threadingContext,
+    Workspace workspace,
+    IGlobalOptionService globalOptions) : IWorkspaceSettingsProviderFactory<NamingStyleSetting>
 {
-    private readonly Workspace _workspace = workspace;
-    private readonly IGlobalOptionService _globalOptions = globalOptions;
-
     public ISettingsProvider<NamingStyleSetting> GetForFile(string filePath)
     {
-        var updater = new NamingStyleSettingsUpdater(_workspace, _globalOptions, filePath);
-        return new NamingStyleSettingsProvider(filePath, updater, _workspace, _globalOptions);
+        var updater = new NamingStyleSettingsUpdater(workspace, globalOptions, filePath);
+        return new NamingStyleSettingsProvider(threadingContext, filePath, updater, workspace, globalOptions);
     }
 }

src/EditorFeatures/Core/EditorConfigSettings/DataProvider/NamingStyles/NamingStyleSettingsWorkspaceServiceFactory.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Composition;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
@@ -14,10 +15,10 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Naming
 [ExportWorkspaceServiceFactory(typeof(IWorkspaceSettingsProviderFactory<NamingStyleSetting>)), Shared]
 [method: ImportingConstructor]
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-internal sealed class NamingStyleSettingsWorkspaceServiceFactory(IGlobalOptionService globalOptions) : IWorkspaceServiceFactory
+internal sealed class NamingStyleSettingsWorkspaceServiceFactory(
+    IThreadingContext threadingContext,
+    IGlobalOptionService globalOptions) : IWorkspaceServiceFactory
 {
-    private readonly IGlobalOptionService _globalOptions = globalOptions;
-
     public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
-        => new NamingStyleSettingsProviderFactory(workspaceServices.Workspace, _globalOptions);
+        => new NamingStyleSettingsProviderFactory(threadingContext, workspaceServices.Workspace, globalOptions);
 }

src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs

@@ -16,32 +16,35 @@
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Extensions;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Shell;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider;
 
-internal abstract class SettingsProviderBase<TData, TOptionsUpdater, TOption, TValue> : ISettingsProvider<TData>
+internal abstract class SettingsProviderBase<TData, TOptionsUpdater, TOption, TValue>(
+    IThreadingContext threadingContext,
+    string fileName,
+    TOptionsUpdater settingsUpdater,
+    Workspace workspace,
+    IGlobalOptionService globalOptions) : ISettingsProvider<TData>
     where TOptionsUpdater : ISettingUpdater<TOption, TValue>
 {
     private readonly List<TData> _snapshot = [];
     private static readonly object s_gate = new();
     private ISettingsEditorViewModel? _viewModel;
-    protected readonly string FileName;
-    protected readonly TOptionsUpdater SettingsUpdater;
-    protected readonly Workspace Workspace;
-    public readonly IGlobalOptionService GlobalOptions;
 
-    protected abstract void UpdateOptions(TieredAnalyzerConfigOptions options, Solution solution, ImmutableArray<Project> projectsInScope);
+    private readonly IThreadingContext _threadingContext = threadingContext;
+    protected readonly string FileName = fileName;
+    protected readonly TOptionsUpdater SettingsUpdater = settingsUpdater;
+    protected readonly Workspace Workspace = workspace;
+    public readonly IGlobalOptionService GlobalOptions = globalOptions;
 
-    protected SettingsProviderBase(string fileName, TOptionsUpdater settingsUpdater, Workspace workspace, IGlobalOptionService globalOptions)
-    {
-        FileName = fileName;
-        SettingsUpdater = settingsUpdater;
-        Workspace = workspace;
-        GlobalOptions = globalOptions;
-    }
+    protected abstract Task UpdateOptionsAsync(
+        TieredAnalyzerConfigOptions options, Solution solution, ImmutableArray<Project> projectsInScope, CancellationToken cancellationToken);
 
     protected void Update()
     {
@@ -60,7 +63,8 @@ protected void Update()
             return;
         }
 
-        var configFileDirectoryOptions = project.State.GetAnalyzerOptionsForPath(givenFolder.FullName, CancellationToken.None);
+        var cancellationToken = _threadingContext.DisposalToken;
+        var configFileDirectoryOptions = project.State.GetAnalyzerOptionsForPath(givenFolder.FullName, cancellationToken);
         var projectDirectoryOptions = project.GetAnalyzerConfigOptions();
 
         // TODO: Support for multiple languages https://github.com/dotnet/roslyn/issues/65859
@@ -70,7 +74,8 @@ protected void Update()
             language: LanguageNames.CSharp,
             editorConfigFileName: FileName);
 
-        UpdateOptions(options, solution, projects);
+        _ = UpdateOptionsAsync(options, solution, projects, cancellationToken)
+            .ReportNonFatalErrorUnlessCancelledAsync(cancellationToken);
     }
 
     public async Task<SourceText> GetChangedEditorConfigAsync(SourceText sourceText)