Simplify

src/EditorFeatures/Test/CodeGeneration/CodeGenerationTests.CSharp.cs

@@ -951,11 +951,10 @@ public async Task AddIndexer2()
                     parameters: Parameters(Parameter(typeof(int), "i")),
                     getStatements: "return String.Empty;",
                     isIndexer: true,
-                    codeGenerationOptions: new CodeGenerationOptions(
-                        options: new TestOptionSet(new Dictionary<OptionKey2, object> {
-                            { CSharpCodeStyleOptions.PreferExpressionBodiedAccessors, CSharpCodeStyleOptions.NeverWithSilentEnforcement },
-                            { CSharpCodeStyleOptions.PreferExpressionBodiedIndexers, CSharpCodeStyleOptions.NeverWithSilentEnforcement },
-                    })));
+                    options: new Dictionary<OptionKey2, object> {
+                        { CSharpCodeStyleOptions.PreferExpressionBodiedAccessors, CSharpCodeStyleOptions.NeverWithSilentEnforcement },
+                        { CSharpCodeStyleOptions.PreferExpressionBodiedIndexers, CSharpCodeStyleOptions.NeverWithSilentEnforcement },
+                    });
             }
 
             internal class TestOptionSet : OptionSet

src/EditorFeatures/Test/CodeGeneration/CodeGenerationTests.cs

@@ -421,9 +421,8 @@ public partial class CodeGenerationTests
                 setAccessor,
                 isIndexer);
 
-            var docOptions = await context.Document.GetOptionsAsync();
             codeGenerationOptions ??= new CodeGenerationOptions();
-            codeGenerationOptions = codeGenerationOptions.With(options: codeGenerationOptions.Options ?? docOptions);
+            codeGenerationOptions = codeGenerationOptions.With(options: codeGenerationOptions.Options ?? workspace.Options);
             context.Result = await context.Service.AddPropertyAsync(context.Solution, (INamedTypeSymbol)context.GetDestination(), property, codeGenerationOptions);
         }