Remove usages of #if CODE_STYLE where possible.
#74958
Merged
Conversation
This file contains 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
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
CyrusNajmabadi
commented
Aug 30, 2024
| using Microsoft.CodeAnalysis.Editing; | ||
| using Microsoft.CodeAnalysis.Formatting; | ||
| using Microsoft.CodeAnalysis.Options; | ||
|
|
||
| namespace Microsoft.CodeAnalysis.OrganizeImports; | ||
|
|
||
| [DataContract] | ||
| internal readonly record struct OrganizeImportsOptions |
There was a problem hiding this comment.
options type moved to tis own file in the CodeStyle layer. The 'Providers' types move to the CodeFixes layer. This removes the need for CODE_STYLE checks, and properly layers things.
CyrusNajmabadi
commented
Aug 30, 2024
| @@ -26,20 +18,11 @@ internal sealed record class CodeCleanupOptions | |||
| [DataMember] public AddImportPlacementOptions AddImportOptions { get; init; } = AddImportPlacementOptions.Default; | |||
| [DataMember] public DocumentFormattingOptions DocumentFormattingOptions { get; init; } = DocumentFormattingOptions.Default; | |||
|
|
|||
| #if !CODE_STYLE | |||
| public static CodeCleanupOptions GetDefault(LanguageServices languageServices) | |||
There was a problem hiding this comment.
thios moved to the CodeFixes layer.
CyrusNajmabadi
commented
Aug 30, 2024
| namespace Microsoft.CodeAnalysis.CodeGeneration; | ||
|
|
||
| [DataContract] | ||
| internal readonly record struct CodeAndImportGenerationOptions |
There was a problem hiding this comment.
extracted out type into its own file.
CyrusNajmabadi
commented
Aug 30, 2024
| } | ||
|
|
||
| [DataContract] | ||
| internal readonly record struct CodeAndImportGenerationOptions |
There was a problem hiding this comment.
moved to its own file.
CyrusNajmabadi
commented
Aug 30, 2024
| @@ -38,28 +30,4 @@ private protected CodeGenerationOptions(IOptionsReader options, string language) | |||
| { | |||
| NamingStyle = options.GetOption(NamingStyleOptions.NamingPreferences, language); | |||
| } | |||
|
|
|||
| #if !CODE_STYLE | |||
There was a problem hiding this comment.
moved to codefixes layer.
CyrusNajmabadi
commented
Aug 30, 2024
| [DataMember] | ||
| public required AddImportPlacementOptions AddImportOptions { get; init; } | ||
|
|
||
| #if !CODE_STYLE |
There was a problem hiding this comment.
moved to codefixes layer.
CyrusNajmabadi
commented
Aug 30, 2024
| #if !CODE_STYLE | ||
| public static SyntaxFormattingOptions GetDefault(Host.LanguageServices languageServices) | ||
| => languageServices.GetRequiredService<ISyntaxFormattingService>().DefaultOptions; | ||
| #endif |
There was a problem hiding this comment.
moved to codefixes layer
CyrusNajmabadi
commented
Aug 30, 2024
| @@ -19,9 +15,4 @@ internal readonly record struct IndentationOptions( | |||
| [DataMember(Order = 2)] public FormattingOptions2.IndentStyle IndentStyle { get; init; } = DefaultIndentStyle; | |||
|
|
|||
| public const FormattingOptions2.IndentStyle DefaultIndentStyle = FormattingOptions2.IndentStyle.Smart; | |||
|
|
|||
| #if !CODE_STYLE | |||
There was a problem hiding this comment.
moved to codefixes layer
CyrusNajmabadi
commented
Aug 30, 2024
| namespace Microsoft.CodeAnalysis.OrganizeImports; | ||
|
|
||
| [DataContract] | ||
| internal readonly record struct OrganizeImportsOptions |
There was a problem hiding this comment.
moved this type to codestyle layer.
CyrusNajmabadi
commented
Aug 30, 2024
| @@ -52,9 +52,4 @@ public bool TryGetQualifyMemberAccessOption(SymbolKind symbolKind, [NotNullWhen( | |||
|
|
|||
| return option != null; | |||
| } | |||
|
|
|||
| #if !CODE_STYLE | |||
There was a problem hiding this comment.
moved to codefixes layer
CyrusNajmabadi
commented
Aug 30, 2024
...paces/SharedUtilitiesAndExtensions/Workspace/Core/CodeCleanup/CodeCleanupOptionsProviders.cs
Outdated
Show resolved
Hide resolved
CyrusNajmabadi
commented
Aug 30, 2024
| @@ -23,31 +19,27 @@ internal readonly record struct CleanCodeGenerationOptions | |||
| [DataMember] | |||
| public required CodeCleanupOptions CleanupOptions { get; init; } | |||
|
|
|||
| #if !CODE_STYLE | |||
There was a problem hiding this comment.
moved to codefixes layer.
CyrusNajmabadi
commented
Aug 30, 2024
| return _document.Project.Solution.Services.GetRequiredLanguageService<TLanguageService>(language); | ||
| #endif | ||
| } | ||
| => _document.Project.Solution.Workspace.Services.GetExtendedLanguageServices(language).GetRequiredService<TLanguageService>(); |
There was a problem hiding this comment.
the call to GetExtendedLanguageServices already defers to GetRequiredLanguageService if not in the code-style layer. so we can simplify all of this.
CyrusNajmabadi
changed the title
#if CODE_STYLE where possible.
CyrusNajmabadi
commented
Aug 30, 2024
src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensions.projitems
Outdated
Show resolved
Hide resolved
…kspaceExtensions.projitems
dibarbet
approved these changes
Aug 30, 2024
This was referenced Sep 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Trying to unify the behavior (and especially teh code) for analyzers/fixers shipped in the features layer and code-style SDK layers.