提交 7aad7be3 编写于 作者: M Manish Vasani

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
上级 62407042
......@@ -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<ImmutableArray<CodeFix>> GetFixesAsync(Project project, IEnumerable<
private static ImmutableArray<CodeFix> GetConfigurations(Project project, IEnumerable<Diagnostic> diagnostics, CancellationToken cancellationToken)
{
// Bail out if NativeEditorConfigSupport experiment is not enabled.
if (!EditorConfigDocumentOptionsProviderFactory.ShouldUseNativeEditorConfigSupport(project.Solution.Workspace))
{
return ImmutableArray<CodeFix>.Empty;
}
var result = ArrayBuilder<CodeFix>.GetInstance();
foreach (var diagnostic in diagnostics)
{
......
......@@ -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<ImmutableArray<CodeFix>> GetFixesAsync(Project project, IEnumerable<
private static ImmutableArray<CodeFix> GetConfigurations(Project project, IEnumerable<Diagnostic> diagnostics, CancellationToken cancellationToken)
{
// Bail out if NativeEditorConfigSupport experiment is not enabled.
if (!EditorConfigDocumentOptionsProviderFactory.ShouldUseNativeEditorConfigSupport(project.Solution.Workspace))
{
return ImmutableArray<CodeFix>.Empty;
}
var result = ArrayBuilder<CodeFix>.GetInstance();
foreach (var diagnostic in diagnostics)
{
......
......@@ -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(@"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册