Merge pull request #53515 from dotnet/merges/release/dev16.10-to-release/dev16.10-vs-deps

Cosifne · web-flow · commit 029847714208 · 2021-05-19T12:08:39.000-07:00
Merge release/dev16.10 to release/dev16.10-vs-deps
diff --git a/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.TestAnalyzerConfigOptions.cs b/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.TestAnalyzerConfigOptions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 
@@ -11,12 +12,22 @@ public partial class SettingsUpdaterTests
     {
         private class TestAnalyzerConfigOptions : AnalyzerConfigOptions
         {
-            public static TestAnalyzerConfigOptions Instance = new TestAnalyzerConfigOptions();
+            public static TestAnalyzerConfigOptions Instance = new();
+            private readonly Func<string, string?>? _lookup = null;
+
+            public TestAnalyzerConfigOptions()
+            {
+            }
+
+            public TestAnalyzerConfigOptions(Func<string, string?> lookup)
+            {
+                _lookup = lookup;
+            }
 
             public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
             {
-                value = null;
-                return false;
+                value = _lookup?.Invoke(key);
+                return value != null;
             }
         }
     }
diff --git a/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.cs b/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.AddImports;
 using Microsoft.CodeAnalysis.CodeStyle;
@@ -24,6 +26,8 @@ namespace Microsoft.CodeAnalysis.Editor.UnitTests
     [UseExportProvider]
     public partial class SettingsUpdaterTests : TestBase
     {
+        private const string EditorconfigPath = "/a/b/config";
+
         private static Workspace CreateWorkspaceWithProjectAndDocuments()
         {
             var projectId = ProjectId.CreateNewId();
@@ -34,7 +38,7 @@ private static Workspace CreateWorkspaceWithProjectAndDocuments()
                 .AddProject(projectId, "proj1", "proj1.dll", LanguageNames.CSharp)
                 .AddDocument(DocumentId.CreateNewId(projectId), "goo.cs", "public class Goo { }")
                 .AddAdditionalDocument(DocumentId.CreateNewId(projectId), "add.txt", "text")
-                .AddAnalyzerConfigDocument(DocumentId.CreateNewId(projectId), "editorcfg", SourceText.From(""), filePath: "/a/b/config")));
+                .AddAnalyzerConfigDocument(DocumentId.CreateNewId(projectId), "editorcfg", SourceText.From(""), filePath: EditorconfigPath)));
 
             return workspace;
         }
@@ -81,9 +85,8 @@ await TestAsync(
         [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)]
         public async Task TestAddNewBoolCodeStyleOptionWithSeverityAsync()
         {
-            var option = CSharpCodeStyleOptions.PreferThrowExpression.DefaultValue;
-            option.Value = true;
-            option.Notification = CodeStyle.NotificationOption2.Suggestion;
+            ICodeStyleOption option = CSharpCodeStyleOptions.PreferThrowExpression.DefaultValue;
+            option = option.WithValue(true).WithNotification(NotificationOption2.Suggestion);
             await TestAsync(
                 string.Empty,
                 "[*.cs]\r\ncsharp_style_throw_expression=true:suggestion",
@@ -93,9 +96,8 @@ await TestAsync(
         [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)]
         public async Task TestAddNewEnumCodeStyleOptionWithSeverityAsync()
         {
-            var option = CSharpCodeStyleOptions.PreferredUsingDirectivePlacement.DefaultValue;
-            option.Value = AddImportPlacement.InsideNamespace;
-            option.Notification = CodeStyle.NotificationOption2.Warning;
+            ICodeStyleOption option = CSharpCodeStyleOptions.PreferredUsingDirectivePlacement.DefaultValue;
+            option = option.WithValue(AddImportPlacement.InsideNamespace).WithNotification(NotificationOption2.Warning);
             await TestAsync(
                 string.Empty,
                 "[*.cs]\r\ncsharp_using_directive_placement=inside_namespace:warning",
@@ -337,20 +339,27 @@ public async Task TestAnalyzerSettingsUpdaterService()
         public async Task TestCodeStyleSettingUpdaterService()
         {
             var workspace = CreateWorkspaceWithProjectAndDocuments();
-            var updater = new OptionUpdater(workspace, "/a/b/config");
+            var updater = new OptionUpdater(workspace, EditorconfigPath);
+            var value = "false:silent";
+            var editorOptions = new TestAnalyzerConfigOptions(key => value);
             var setting = CodeStyleSetting.Create(CSharpCodeStyleOptions.AllowBlankLineAfterColonInConstructorInitializer,
                                                   "",
-                                                  TestAnalyzerConfigOptions.Instance,
+                                                  editorOptions,
                                                   workspace.Options,
                                                   updater);
             setting.ChangeSeverity(DiagnosticSeverity.Error);
             var updates = await updater.GetChangedEditorConfigAsync(default);
             var update = Assert.Single(updates);
-            Assert.Equal("[*.cs]\r\ncsharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental=true:error", update.NewText);
-            setting.ChangeValue(1);
+            Assert.Equal("[*.cs]\r\ncsharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental=false:error", update.NewText);
+            value = "false:error";
+            var editorconfig = workspace.CurrentSolution.Projects.SelectMany(p => p.AnalyzerConfigDocuments.Where(a => a.FilePath == EditorconfigPath)).Single();
+            var text = await editorconfig.GetTextAsync();
+            var newSolution = workspace.CurrentSolution.WithAnalyzerConfigDocumentText(editorconfig.Id, text);
+            Assert.True(workspace.TryApplyChanges(newSolution));
+            setting.ChangeValue(0);
             updates = await updater.GetChangedEditorConfigAsync(default);
             update = Assert.Single(updates);
-            Assert.Equal("[*.cs]\r\ncsharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental=false:error", update.NewText);
+            Assert.Equal("[*.cs]\r\ncsharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental=true:error", update.NewText);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)]
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/AnalyzerSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/AnalyzerSetting.cs
@@ -51,7 +51,7 @@ internal void ChangeSeverity(DiagnosticSeverity severity)
                 return;
 
             Severity = severity;
-            _ = _settingsUpdater.QueueUpdateAsync(this, severity);
+            _settingsUpdater.QueueUpdate(this, severity);
         }
     }
 }
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.BooleanCodeStyleSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.BooleanCodeStyleSetting.cs
@@ -35,17 +35,15 @@ public BooleanCodeStyleSetting(Option2<CodeStyleOption2<bool>> option,
 
             protected override void ChangeSeverity(NotificationOption2 severity)
             {
-                var option = GetOption();
-                option.Notification = severity;
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithNotification(severity));
             }
 
             public override void ChangeValue(int valueIndex)
             {
                 var value = valueIndex == 0;
-                var option = GetOption();
-                option.Value = value;
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithValue(value));
             }
 
             protected override CodeStyleOption2<bool> GetOption()
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.EnumCodeStyleSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.EnumCodeStyleSetting.cs
@@ -37,16 +37,14 @@ public EnumCodeStyleSetting(Option2<CodeStyleOption2<T>> option,
 
             protected override void ChangeSeverity(NotificationOption2 severity)
             {
-                var option = GetOption();
-                option.Notification = severity;
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithNotification(severity));
             }
 
             public override void ChangeValue(int valueIndex)
             {
-                var option = GetOption();
-                option.Value = _enumValues[valueIndex];
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithValue(_enumValues[valueIndex]));
             }
 
             protected override CodeStyleOption2<T> GetOption()
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.PerLanguageBooleanCodeStyleSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.PerLanguageBooleanCodeStyleSetting.cs
@@ -35,17 +35,15 @@ public PerLanguageBooleanCodeStyleSetting(PerLanguageOption2<CodeStyleOption2<bo
 
             protected override void ChangeSeverity(NotificationOption2 severity)
             {
-                var option = GetOption();
-                option.Notification = severity;
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithNotification(severity));
             }
 
             public override void ChangeValue(int valueIndex)
             {
                 var value = valueIndex == 0;
-                var option = GetOption();
-                option.Value = value;
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithValue(value));
             }
 
             protected override CodeStyleOption2<bool> GetOption()
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.PerLanguageEnumCodeStyleSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/CodeStyle/CodeStyleSetting.PerLanguageEnumCodeStyleSetting.cs
@@ -37,16 +37,14 @@ public PerLanguageEnumCodeStyleSetting(PerLanguageOption2<CodeStyleOption2<T>> o
 
             protected override void ChangeSeverity(NotificationOption2 severity)
             {
-                var option = GetOption();
-                option.Notification = severity;
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithNotification(severity));
             }
 
             public override void ChangeValue(int valueIndex)
             {
-                var option = GetOption();
-                option.Value = _enumValues[valueIndex];
-                _ = Updater.QueueUpdateAsync(_option, option);
+                ICodeStyleOption option = GetOption();
+                Updater.QueueUpdate(_option, option.WithValue(_enumValues[valueIndex]));
             }
 
             protected override CodeStyleOption2<T> GetOption()
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting`1.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting`1.cs
@@ -68,7 +68,7 @@ public FormattingSetting(Option2<T> option,
         public override void SetValue(object value)
         {
             Value = (T)value;
-            _ = Updater.QueueUpdateAsync(_option, value);
+            Updater.QueueUpdate(_option, value);
         }
 
         public override object? GetValue() => Value;
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/PerLanguageFormattingSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/PerLanguageFormattingSetting.cs
@@ -68,7 +68,7 @@ public PerLanguageFormattingSetting(PerLanguageOption2<T> option,
         public override void SetValue(object value)
         {
             Value = (T)value;
-            _ = Updater.QueueUpdateAsync(_option, value);
+            Updater.QueueUpdate(_option, value);
         }
 
         public override object? GetValue() => Value;
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Updater/ISettingUpdater.cs b/src/EditorFeatures/Core/EditorConfigSettings/Updater/ISettingUpdater.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Text;
@@ -11,7 +10,7 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater
 {
     internal interface ISettingUpdater<TSetting, TValue>
     {
-        Task<bool> QueueUpdateAsync(TSetting setting, TValue value);
+        void QueueUpdate(TSetting setting, TValue value);
         Task<SourceText?> GetChangedEditorConfigAsync(SourceText sourceText, CancellationToken token);
         Task<bool> HasAnyChangesAsync();
     }
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Updater/SettingsUpdaterBase.cs b/src/EditorFeatures/Core/EditorConfigSettings/Updater/SettingsUpdaterBase.cs
@@ -6,6 +6,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
@@ -15,6 +17,7 @@ internal abstract class SettingsUpdaterBase<TOption, TValue> : ISettingUpdater<T
     {
         private readonly List<(TOption option, TValue value)> _queue = new();
         private readonly SemaphoreSlim _guard = new(1);
+        private readonly IAsynchronousOperationListener _listener;
         protected readonly Workspace Workspace;
         protected readonly string EditorconfigPath;
 
@@ -23,17 +26,25 @@ internal abstract class SettingsUpdaterBase<TOption, TValue> : ISettingUpdater<T
         protected SettingsUpdaterBase(Workspace workspace, string editorconfigPath)
         {
             Workspace = workspace;
+            _listener = workspace.Services.GetRequiredService<IWorkspaceAsynchronousOperationListenerProvider>().GetListener();
             EditorconfigPath = editorconfigPath;
         }
 
-        public async Task<bool> QueueUpdateAsync(TOption setting, TValue value)
+        public void QueueUpdate(TOption setting, TValue value)
         {
-            using (await _guard.DisposableWaitAsync().ConfigureAwait(false))
+            var token = _listener.BeginAsyncOperation(nameof(QueueUpdate));
+            _ = QueueUpdateAsync().CompletesAsyncOperation(token);
+
+            return;
+
+            // local function
+            async Task QueueUpdateAsync()
             {
-                _queue.Add((setting, value));
+                using (await _guard.DisposableWaitAsync().ConfigureAwait(false))
+                {
+                    _queue.Add((setting, value));
+                }
             }
-
-            return true;
         }
 
         public async Task<SourceText?> GetChangedEditorConfigAsync(AnalyzerConfigDocument analyzerConfigDocument, CancellationToken token)
diff --git a/src/EditorFeatures/Test/EditorConfigSettings/Data/CodeStyleSettingsTest.cs b/src/EditorFeatures/Test/EditorConfigSettings/Data/CodeStyleSettingsTest.cs
@@ -58,7 +58,7 @@ public static void CodeStyleSettingEnumFactory(DayOfWeek defaultValue)
         private static Option2<CodeStyleOption2<bool>> CreateBoolOption(bool @default = false)
         {
             var option = CodeStyleOption2<bool>.Default;
-            option.Value = @default;
+            option = (CodeStyleOption2<bool>)((ICodeStyleOption)option).WithValue(@default);
             return new Option2<CodeStyleOption2<bool>>(feature: "TestFeature",
                                                        name: "TestOption",
                                                        defaultValue: option);
@@ -68,7 +68,7 @@ private static Option2<CodeStyleOption2<T>> CreateEnumOption<T>(T @default)
             where T : notnull, Enum
         {
             var option = CodeStyleOption2<T>.Default;
-            option.Value = @default;
+            option = (CodeStyleOption2<T>)((ICodeStyleOption)option).WithValue(@default);
             return new Option2<CodeStyleOption2<T>>(feature: "TestFeature",
                                                     name: "TestOption",
                                                     defaultValue: option);
diff --git a/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOption.cs b/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOption.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.CodeAnalysis.CodeStyle
 {
     /// <inheritdoc cref="CodeStyleOption2{T}"/>
-    public class CodeStyleOption<T> : ICodeStyleOption, IEquatable<CodeStyleOption<T>>
+    public sealed class CodeStyleOption<T> : ICodeStyleOption, IEquatable<CodeStyleOption<T>>
     {
         static CodeStyleOption()
         {
@@ -32,7 +32,9 @@ public CodeStyleOption(T value, NotificationOption notification)
         public T Value
         {
             get => _codeStyleOptionImpl.Value;
-            set => _codeStyleOptionImpl.Value = value;
+
+            [Obsolete("Modifying a CodeStyleOption<T> is not supported.", error: true)]
+            set => throw new InvalidOperationException();
         }
 
         bool IObjectWritable.ShouldReuseInSerialization => _codeStyleOptionImpl.ShouldReuseInSerialization;
@@ -47,7 +49,9 @@ ICodeStyleOption ICodeStyleOption.AsCodeStyleOption<TCodeStyleOption>()
         public NotificationOption Notification
         {
             get => (NotificationOption)_codeStyleOptionImpl.Notification;
-            set => _codeStyleOptionImpl.Notification = (NotificationOption2)(value ?? throw new ArgumentNullException(nameof(value)));
+
+            [Obsolete("Modifying a CodeStyleOption<T> is not supported.", error: true)]
+            set => throw new InvalidOperationException();
         }
 
         internal CodeStyleOption2<T> UnderlyingOption => _codeStyleOptionImpl;
diff --git a/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOption2_operators.cs b/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOption2_operators.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.CodeAnalysis.CodeStyle
 {
-    internal partial class CodeStyleOption2<T>
+    internal sealed partial class CodeStyleOption2<T>
     {
         [return: NotNullIfNotNull("option")]
         public static explicit operator CodeStyleOption<T>?(CodeStyleOption2<T>? option)
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CodeStyle/CodeStyleOption2`1.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CodeStyle/CodeStyleOption2`1.cs
@@ -37,7 +37,7 @@ internal interface ICodeStyleOption : IObjectWritable
     /// hosts that expect the value to be a boolean.  Specifically, if the enum value is 0 or 1
     /// then those values will write back as false/true.
     /// </summary>
-    internal partial class CodeStyleOption2<T> : ICodeStyleOption, IEquatable<CodeStyleOption2<T>?>
+    internal sealed partial class CodeStyleOption2<T> : ICodeStyleOption, IEquatable<CodeStyleOption2<T>?>
     {
         static CodeStyleOption2()
         {
@@ -48,15 +48,15 @@ static CodeStyleOption2()
 
         private const int SerializationVersion = 1;
 
-        private NotificationOption2 _notification;
+        private readonly NotificationOption2 _notification;
 
         public CodeStyleOption2(T value, NotificationOption2 notification)
         {
             Value = value;
             _notification = notification ?? throw new ArgumentNullException(nameof(notification));
         }
 
-        public T Value { get; set; }
+        public T Value { get; }
 
         object? ICodeStyleOption.Value => this.Value;
         ICodeStyleOption ICodeStyleOption.WithValue(object value) => new CodeStyleOption2<T>((T)value, Notification);
@@ -75,7 +75,6 @@ ICodeStyleOption ICodeStyleOption.AsCodeStyleOption<TCodeStyleOption>()
         public NotificationOption2 Notification
         {
             get => _notification;
-            set => _notification = value ?? throw new ArgumentNullException(nameof(value));
         }
 
         public XElement ToXElement() =>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
	`5`	`+using System;`
`5`	`6`	`using System.Diagnostics.CodeAnalysis;`
`6`	`7`	`using Microsoft.CodeAnalysis.Diagnostics;`
`7`	`8`
`@@ -11,12 +12,22 @@ public partial class SettingsUpdaterTests`
`11`	`12`	`{`
`12`	`13`	`private class TestAnalyzerConfigOptions : AnalyzerConfigOptions`
`13`	`14`	`{`
`14`		`- public static TestAnalyzerConfigOptions Instance = new TestAnalyzerConfigOptions();`
	`15`	`+ public static TestAnalyzerConfigOptions Instance = new();`
	`16`	`+ private readonly Func<string, string?>? _lookup = null;`
	`17`	`+`
	`18`	`+ public TestAnalyzerConfigOptions()`
	`19`	`+ {`
	`20`	`+ }`
	`21`	`+`
	`22`	`+ public TestAnalyzerConfigOptions(Func<string, string?> lookup)`
	`23`	`+ {`
	`24`	`+ _lookup = lookup;`
	`25`	`+ }`
`15`	`26`
`16`	`27`	`public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)`
`17`	`28`	`{`
`18`		`- value = null;`
`19`		`- return false;`
	`29`	`+ value = _lookup?.Invoke(key);`
	`30`	`+ return value != null;`
`20`	`31`	`}`
`21`	`32`	`}`
`22`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ internal void ChangeSeverity(DiagnosticSeverity severity)`
`51`	`51`	`return;`
`52`	`52`
`53`	`53`	`Severity = severity;`
`54`		`- _ = _settingsUpdater.QueueUpdateAsync(this, severity);`
	`54`	`+ _settingsUpdater.QueueUpdate(this, severity);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,15 @@ public BooleanCodeStyleSetting(Option2<CodeStyleOption2<bool>> option,`
`35`	`35`
`36`	`36`	`protected override void ChangeSeverity(NotificationOption2 severity)`
`37`	`37`	`{`
`38`		`- var option = GetOption();`
`39`		`- option.Notification = severity;`
`40`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`38`	`+ ICodeStyleOption option = GetOption();`
	`39`	`+ Updater.QueueUpdate(_option, option.WithNotification(severity));`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`public override void ChangeValue(int valueIndex)`
`44`	`43`	`{`
`45`	`44`	`var value = valueIndex == 0;`
`46`		`- var option = GetOption();`
`47`		`- option.Value = value;`
`48`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`45`	`+ ICodeStyleOption option = GetOption();`
	`46`	`+ Updater.QueueUpdate(_option, option.WithValue(value));`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`protected override CodeStyleOption2<bool> GetOption()`
Original file line number	Diff line number	Diff line change
`@@ -37,16 +37,14 @@ public EnumCodeStyleSetting(Option2<CodeStyleOption2<T>> option,`
`37`	`37`
`38`	`38`	`protected override void ChangeSeverity(NotificationOption2 severity)`
`39`	`39`	`{`
`40`		`- var option = GetOption();`
`41`		`- option.Notification = severity;`
`42`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`40`	`+ ICodeStyleOption option = GetOption();`
	`41`	`+ Updater.QueueUpdate(_option, option.WithNotification(severity));`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`public override void ChangeValue(int valueIndex)`
`46`	`45`	`{`
`47`		`- var option = GetOption();`
`48`		`- option.Value = _enumValues[valueIndex];`
`49`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`46`	`+ ICodeStyleOption option = GetOption();`
	`47`	`+ Updater.QueueUpdate(_option, option.WithValue(_enumValues[valueIndex]));`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`protected override CodeStyleOption2<T> GetOption()`
Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,15 @@ public PerLanguageBooleanCodeStyleSetting(PerLanguageOption2<CodeStyleOption2<bo`
`35`	`35`
`36`	`36`	`protected override void ChangeSeverity(NotificationOption2 severity)`
`37`	`37`	`{`
`38`		`- var option = GetOption();`
`39`		`- option.Notification = severity;`
`40`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`38`	`+ ICodeStyleOption option = GetOption();`
	`39`	`+ Updater.QueueUpdate(_option, option.WithNotification(severity));`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`public override void ChangeValue(int valueIndex)`
`44`	`43`	`{`
`45`	`44`	`var value = valueIndex == 0;`
`46`		`- var option = GetOption();`
`47`		`- option.Value = value;`
`48`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`45`	`+ ICodeStyleOption option = GetOption();`
	`46`	`+ Updater.QueueUpdate(_option, option.WithValue(value));`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`protected override CodeStyleOption2<bool> GetOption()`
Original file line number	Diff line number	Diff line change
`@@ -37,16 +37,14 @@ public PerLanguageEnumCodeStyleSetting(PerLanguageOption2<CodeStyleOption2<T>> o`
`37`	`37`
`38`	`38`	`protected override void ChangeSeverity(NotificationOption2 severity)`
`39`	`39`	`{`
`40`		`- var option = GetOption();`
`41`		`- option.Notification = severity;`
`42`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`40`	`+ ICodeStyleOption option = GetOption();`
	`41`	`+ Updater.QueueUpdate(_option, option.WithNotification(severity));`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`public override void ChangeValue(int valueIndex)`
`46`	`45`	`{`
`47`		`- var option = GetOption();`
`48`		`- option.Value = _enumValues[valueIndex];`
`49`		`- _ = Updater.QueueUpdateAsync(_option, option);`
	`46`	`+ ICodeStyleOption option = GetOption();`
	`47`	`+ Updater.QueueUpdate(_option, option.WithValue(_enumValues[valueIndex]));`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`protected override CodeStyleOption2<T> GetOption()`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public FormattingSetting(Option2<T> option,`
`68`	`68`	`public override void SetValue(object value)`
`69`	`69`	`{`
`70`	`70`	`Value = (T)value;`
`71`		`- _ = Updater.QueueUpdateAsync(_option, value);`
	`71`	`+ Updater.QueueUpdate(_option, value);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public override object? GetValue() => Value;`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public PerLanguageFormattingSetting(PerLanguageOption2<T> option,`
`68`	`68`	`public override void SetValue(object value)`
`69`	`69`	`{`
`70`	`70`	`Value = (T)value;`
`71`		`- _ = Updater.QueueUpdateAsync(_option, value);`
	`71`	`+ Updater.QueueUpdate(_option, value);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public override object? GetValue() => Value;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-using System.Collections.Generic;`
`6`	`5`	`using System.Threading;`
`7`	`6`	`using System.Threading.Tasks;`
`8`	`7`	`using Microsoft.CodeAnalysis.Text;`
`@@ -11,7 +10,7 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater`
`11`	`10`	`{`
`12`	`11`	`internal interface ISettingUpdater<TSetting, TValue>`
`13`	`12`	`{`
`14`		`- Task<bool> QueueUpdateAsync(TSetting setting, TValue value);`
	`13`	`+ void QueueUpdate(TSetting setting, TValue value);`
`15`	`14`	`Task<SourceText?> GetChangedEditorConfigAsync(SourceText sourceText, CancellationToken token);`
`16`	`15`	`Task<bool> HasAnyChangesAsync();`
`17`	`16`	`}`