From 7aad7be39c6c9bf59eb33ae1489a48107f9c5f6e Mon Sep 17 00:00:00 2001 From: Manish Vasani Date: Tue, 16 Jul 2019 13:40:07 -0700 Subject: [PATCH] Bail out if NativeEditorConfigSupport experiment is disabled Also revert the changes to integration tests until the experiment is always on by default/removed. I'll keep #36330 open to track reverting this commit --- ...ConfigureCodeStyleOptionCodeFixProvider.cs | 7 ++++ .../ConfigureSeverityLevelCodeFixProvider.cs | 7 ++++ .../CSharp/CSharpCodeActions.cs | 41 ++++++++++--------- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureCodeStyle/ConfigureCodeStyleOptionCodeFixProvider.cs b/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureCodeStyle/ConfigureCodeStyleOptionCodeFixProvider.cs index 493fa2c5a4f..9f18d544fb7 100644 --- a/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureCodeStyle/ConfigureCodeStyleOptionCodeFixProvider.cs +++ b/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureCodeStyle/ConfigureCodeStyleOptionCodeFixProvider.cs @@ -13,6 +13,7 @@ using Microsoft.CodeAnalysis.CodeStyle; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.Options.EditorConfig; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using static Microsoft.CodeAnalysis.CodeActions.CodeAction; @@ -53,6 +54,12 @@ public Task> GetFixesAsync(Project project, IEnumerable< private static ImmutableArray GetConfigurations(Project project, IEnumerable diagnostics, CancellationToken cancellationToken) { + // Bail out if NativeEditorConfigSupport experiment is not enabled. + if (!EditorConfigDocumentOptionsProviderFactory.ShouldUseNativeEditorConfigSupport(project.Solution.Workspace)) + { + return ImmutableArray.Empty; + } + var result = ArrayBuilder.GetInstance(); foreach (var diagnostic in diagnostics) { diff --git a/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureSeverity/ConfigureSeverityLevelCodeFixProvider.cs b/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureSeverity/ConfigureSeverityLevelCodeFixProvider.cs index 0023716701b..6de24c014c5 100644 --- a/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureSeverity/ConfigureSeverityLevelCodeFixProvider.cs +++ b/src/Features/Core/Portable/CodeFixes/Configuration/ConfigureSeverity/ConfigureSeverityLevelCodeFixProvider.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeActions; using Microsoft.CodeAnalysis.CodeFixes.Suppression; +using Microsoft.CodeAnalysis.Options.EditorConfig; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using static Microsoft.CodeAnalysis.CodeActions.CodeAction; @@ -41,6 +42,12 @@ public Task> GetFixesAsync(Project project, IEnumerable< private static ImmutableArray GetConfigurations(Project project, IEnumerable diagnostics, CancellationToken cancellationToken) { + // Bail out if NativeEditorConfigSupport experiment is not enabled. + if (!EditorConfigDocumentOptionsProviderFactory.ShouldUseNativeEditorConfigSupport(project.Solution.Workspace)) + { + return ImmutableArray.Empty; + } + var result = ArrayBuilder.GetInstance(); foreach (var diagnostic in diagnostics) { diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpCodeActions.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpCodeActions.cs index 6d7c247b324..9566affbaa9 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpCodeActions.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpCodeActions.cs @@ -492,12 +492,13 @@ public class P2 { }"); "Generate new type...", "Remove unused variable", "Configure or Suppress issues", - "Configure CS0168 severity", - "None", - "Silent", - "Suggestion", - "Warning", - "Error", + // https://github.com/dotnet/roslyn/issues/36330 + //"Configure CS0168 severity", + //"None", + //"Silent", + //"Suggestion", + //"Warning", + //"Error", "Suppress CS0168", "in Source" }; @@ -539,12 +540,13 @@ static void Main(string[] args) "Generate new type...", "Goober - using N;", "Configure or Suppress issues", - "Configure CS0168 severity", - "None", - "Silent", - "Suggestion", - "Warning", - "Error", + // https://github.com/dotnet/roslyn/issues/36330 + //"Configure CS0168 severity", + //"None", + //"Silent", + //"Suggestion", + //"Warning", + //"Error", "Suppress CS0168", "in Source", }; @@ -581,12 +583,13 @@ static void Main(string[] args) "Extract Method", generateImplicitTitle, "Configure or Suppress issues", - "Configure CS0612 severity", - "None", - "Silent", - "Suggestion", - "Warning", - "Error", + // https://github.com/dotnet/roslyn/issues/36330 + //"Configure CS0612 severity", + //"None", + //"Silent", + //"Suggestion", + //"Warning", + //"Error", "Suppress CS0612", "in Source", }; @@ -644,7 +647,7 @@ static void Main(string[] args) } - [WpfFact, Trait(Traits.Feature, Traits.Features.CodeActionsConfiguration)] + [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36330"), Trait(Traits.Feature, Traits.Features.CodeActionsConfiguration)] public void ConfigureCodeStyleOptionValueAndSeverity() { SetUpEditor(@" -- GitLab