Remove CompilationPair abstraction in diagnostic analyzer subsystem. #80086
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // 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.Diagnostics.CodeAnalysis; | ||
| using System.Linq; | ||
| using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles; | ||
|
|
||
| namespace Microsoft.CodeAnalysis.Diagnostics; | ||
|
|
||
| internal static class AnalyzerOptionsUtilities | ||
| { | ||
| /// <summary> | ||
| /// Combines two <see cref="AnalyzerOptions"/> instances into one. The resulting instance will have the | ||
| /// options merged from both. Options defined in <paramref name="projectAnalyzerOptions"/> ("EditorConfig options") | ||
| /// will take precedence over those in <paramref name="hostAnalyzerOptions"/> (VS UI options). | ||
| /// </summary> | ||
| public static AnalyzerOptions Combine(AnalyzerOptions projectAnalyzerOptions, AnalyzerOptions hostAnalyzerOptions) | ||
| { | ||
| return new AnalyzerOptions( | ||
| projectAnalyzerOptions.AdditionalFiles.AddRange(hostAnalyzerOptions.AdditionalFiles).Distinct(), | ||
| new CombinedAnalyzerConfigOptionsProvider(projectAnalyzerOptions, hostAnalyzerOptions)); | ||
| } | ||
|
|
||
| private sealed class CombinedAnalyzerConfigOptionsProvider( | ||
| AnalyzerOptions projectAnalyzerOptions, | ||
| AnalyzerOptions hostAnalyzerOptions) : AnalyzerConfigOptionsProvider | ||
| { | ||
| private readonly AnalyzerOptions _analyzerOptions = projectAnalyzerOptions; | ||
| private readonly AnalyzerOptions _hostAnalyzerOptions = hostAnalyzerOptions; | ||
|
|
||
| public override AnalyzerConfigOptions GlobalOptions | ||
| => new CombinedAnalyzerConfigOptions( | ||
| _analyzerOptions.AnalyzerConfigOptionsProvider.GlobalOptions, | ||
| _hostAnalyzerOptions.AnalyzerConfigOptionsProvider.GlobalOptions); | ||
|
|
||
| public override AnalyzerConfigOptions GetOptions(SyntaxTree tree) | ||
| => new CombinedAnalyzerConfigOptions( | ||
| _analyzerOptions.AnalyzerConfigOptionsProvider.GetOptions(tree), | ||
| _hostAnalyzerOptions.AnalyzerConfigOptionsProvider.GetOptions(tree)); | ||
|
|
||
| public override AnalyzerConfigOptions GetOptions(AdditionalText textFile) | ||
| => new CombinedAnalyzerConfigOptions( | ||
| _analyzerOptions.AnalyzerConfigOptionsProvider.GetOptions(textFile), | ||
| _hostAnalyzerOptions.AnalyzerConfigOptionsProvider.GetOptions(textFile)); | ||
|
|
||
| private sealed class CombinedAnalyzerConfigOptions( | ||
| AnalyzerConfigOptions projectOptions, | ||
| AnalyzerConfigOptions hostOptions) : StructuredAnalyzerConfigOptions | ||
| { | ||
| public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value) | ||
| // Lookup in project options first. Editor config should override the values from the host. | ||
| => projectOptions.TryGetValue(key, out value) || hostOptions.TryGetValue(key, out value); | ||
|
|
||
| public override IEnumerable<string> Keys | ||
| => projectOptions.Keys.Union(hostOptions.Keys); | ||
|
|
||
| public override NamingStylePreferences GetNamingStylePreferences() | ||
| { | ||
| var preferences = (projectOptions as StructuredAnalyzerConfigOptions)?.GetNamingStylePreferences(); | ||
| if (preferences is { IsEmpty: false }) | ||
| return preferences; | ||
|
|
||
| preferences = (hostOptions as StructuredAnalyzerConfigOptions)?.GetNamingStylePreferences(); | ||
| if (preferences is { IsEmpty: false }) | ||
| return preferences; | ||
|
|
||
| return NamingStylePreferences.Empty; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is the correct behavior. The test here is testing " 'usings' should be INSIDE the namespace, and it is an ERROR otherwise". So it was a bug this wasn't moving in in CodeCleanup.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: this differs from teh tests taht validate that nothing change when the option suggestions the change, but the severity is set to 'hidden'. in that case we do not make any change.