diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/GenerateVariable/GenerateVariableTests.cs index 0a03bcd7a1877b9b5d812fa4c405d93892bc63a7..5a1ce2e02e6421fcf4e3a513cceaa725a5c84bd8 100644 --- a/src/EditorFeatures/CSharpTest/Diagnostics/GenerateVariable/GenerateVariableTests.cs +++ b/src/EditorFeatures/CSharpTest/Diagnostics/GenerateVariable/GenerateVariableTests.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeFixes; +using Microsoft.CodeAnalysis.CodeStyle; using Microsoft.CodeAnalysis.CSharp.CodeFixes.GenerateVariable; using Microsoft.CodeAnalysis.CSharp.CodeStyle; using Microsoft.CodeAnalysis.Diagnostics; @@ -21,6 +22,21 @@ public class GenerateVariableTests : AbstractCSharpDiagnosticProviderBasedUserDi null, new GenerateVariableCodeFixProvider()); } + private readonly SimpleCodeStyleOption onWithInfo = new SimpleCodeStyleOption(true, NotificationOption.Info); + + // specify all options explicitly to override defaults. + private IDictionary ImplicitTypingEverywhere() => + OptionSet(CSharpCodeStyleOptions.UseImplicitTypeWherePossible, onWithInfo) + .With(CSharpCodeStyleOptions.UseImplicitTypeWhereApparent, onWithInfo) + .With(CSharpCodeStyleOptions.UseImplicitTypeForIntrinsicTypes, onWithInfo); + + internal IDictionary OptionSet(OptionKey option, object value) + { + var options = new Dictionary(); + options.Add(option, value); + return options; + } + [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)] public async Task TestSimpleLowercaseIdentifier1() { @@ -1771,7 +1787,7 @@ public async Task TestGenerateFromAssign1() await TestAsync( @"class Program { void Main ( ) { [|undefined|] = 1 ; } } ", @"class Program { void Main ( ) { var undefined = 1 ; } } ", -index: 2); +index: 2, options: ImplicitTypingEverywhere()); } [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)] @@ -1853,7 +1869,7 @@ void Foo() #line default #line hidden } -"); +", options: ImplicitTypingEverywhere()); } [WorkItem(546027, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546027")]