-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enhance solution formatting and cleanup post Rider 2023.2.3 upgrade (#…
…214) ### Summary & Motivation Perform a cleanup across the entire solution following the upgrade to Rider 2023.2.3. Move JetBrains formatting rules from `.editorconfig` to a `.DotSettings` file. This change enforces JetBrains formatting out-of-the-box and offers more granular control. Add a `.NET only` cleanup profile to `.DotSettings` to prevent ReSharper and Rider from formatting frontend files. To maintain consistent formatting in frontend files, "Format on Save" should be manually configured to use Prettier. Additionally, file types such as `.html`, `.css`, and `.json` need to be added to Prettier's configuration for comprehensive coverage. Furthermore, .NET tools, including the JetBrains inspectcode and cleanupcode formatter, have been added to `dotnet-tools.json`. This inclusion streamlines tool management and ensures consistency across development environments. The GitHub workflow has been correspondingly updated to reflect these tooling changes, enhancing the efficiency and reliability of our continuous integration process. Build will now fail if there are any formatting or code inspection warnings. ### Checklist - [x] I have added a Label to the pull-request - [x] I have added tests, and done manual regression tests - [x] I have updated the documentation, if necessary
- Loading branch information
Showing
28 changed files
with
194 additions
and
3,516 deletions.
There are no files selected for viewing
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=_002ENET_0020only/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name=".NET only"><CppCodeStyleCleanupDescriptor /><CSReorderTypeMembers>True</CSReorderTypeMembers><CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><IDEA_SETTINGS>&lt;profile version="1.0"&gt; | ||
| &lt;option name="profileName" value=".NET only" /&gt; | ||
| &lt;inspection_tool class="ES6ShorthandObjectProperty" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="JSPrimitiveTypeWrapperUsage" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="JSRemoveUnnecessaryParentheses" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="TypeScriptExplicitMemberType" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="UnnecessaryContinueJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="UnnecessaryLabelJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="UnnecessaryLabelOnBreakStatementJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="UnnecessaryLabelOnContinueStatementJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="UnnecessaryReturnJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; | ||
| &lt;inspection_tool class="WrongPropertyKeyValueDelimiter" enabled="false" level="WEAK WARNING" enabled_by_default="false" /&gt; | ||
| &lt;/profile&gt;</IDEA_SETTINGS><RIDER_SETTINGS>&lt;profile&gt; | ||
| &lt;Language id="CSS"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;Rearrange&gt;false&lt;/Rearrange&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="EditorConfig"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="HTML"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; | ||
| &lt;Rearrange&gt;false&lt;/Rearrange&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="HTTP Request"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="Handlebars"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="Ini"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="JSON"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="Jade"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="JavaScript"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; | ||
| &lt;Rearrange&gt;false&lt;/Rearrange&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="Markdown"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="Properties"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="RELAX-NG"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="SQL"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="VueExpr"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="XML"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; | ||
| &lt;Rearrange&gt;false&lt;/Rearrange&gt; | ||
| &lt;/Language&gt; | ||
| &lt;Language id="yaml"&gt; | ||
| &lt;Reformat&gt;false&lt;/Reformat&gt; | ||
| &lt;/Language&gt; | ||
| &lt;/profile&gt;</RIDER_SETTINGS><XAMLCollapseEmptyTags>False</XAMLCollapseEmptyTags></Profile></s:String> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultilineStatement</s:String> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/MODIFIERS_ORDER/@EntryValue">public protected required private file new internal static override abstract sealed virtual extern unsafe volatile async readonly</s:String> | ||
| <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_AUTO_PROPERTY/@EntryValue">1</s:Int64> | ||
| <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean> | ||
| </wpf:ResourceDictionary> |
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
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
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
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
File renamed without changes.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -72,6 +72,7 @@ | |
| * { | ||
| @apply border-border; | ||
| } | ||
|
|
||
| body { | ||
| @apply bg-background text-foreground; | ||
| } | ||
|
|
||
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
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
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
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
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
Oops, something went wrong.