Implemented bracket formatting for binary expressions

.editorconfig

@@ -6,6 +6,12 @@ root = true
 [*]
 indent_style = space
 
+[*.xml]
+indent_size = 2
+
+[Analyzers.xml]
+trim_trailing_whitespace = false
+
 # Code files
 [*.{cs,csx}]
 indent_size = 4

.github/workflows/build.yml

@@ -71,7 +71,7 @@ jobs:
             ../wordb/data/tech.acronyms.txt
 
   build_core_and_testing:
-    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v') 
+    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v')
     needs: pre_build
     runs-on: ubuntu-24.04
     env:
@@ -90,7 +90,7 @@ jobs:
           path: src/_nupkg/*nupkg
 
   build_analyzers:
-    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v') 
+    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v')
     needs: pre_build
     runs-on: ubuntu-24.04
     env:
@@ -123,7 +123,7 @@ jobs:
           path: src/${{ matrix.component.name }}.CodeFixes/bin/Release/*.*nupkg
 
   build_refactorings:
-    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v') 
+    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v')
     needs: pre_build
     runs-on: ubuntu-24.04
     env:
@@ -144,7 +144,7 @@ jobs:
           path: src/Refactorings/bin/Release/*.*nupkg
 
   build_code_fixes:
-    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v') 
+    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v')
     needs: pre_build
     runs-on: ubuntu-24.04
     env:
@@ -165,7 +165,7 @@ jobs:
           path: src/CodeFixes/bin/Release/*.*nupkg
 
   build_vs_extension:
-    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v') 
+    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v')
     needs: pre_build
     runs-on: windows-latest
     env:
@@ -199,7 +199,7 @@ jobs:
           delete-merged: true
 
   build_vs_code_extension:
-    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v') 
+    if: github.ref_type != 'tag' || startsWith(github.ref_name, 'v')
     needs: [ pre_build, build_analyzers ]
     runs-on: ubuntu-24.04
     env:
@@ -209,6 +209,9 @@ jobs:
         working-directory: src/VisualStudioCode
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.301
       - run: dotnet restore
       - run: dotnet build --no-restore
       - run: |
@@ -263,7 +266,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.101
+          dotnet-version: 9.0.301
       - run: dotnet restore
       - run: dotnet build --no-restore
       - run: dotnet pack --no-build

.gitignore

@@ -140,7 +140,7 @@ publish/
 *.[Pp]ublish.xml
 *.azurePubxml
 
-# TODO: Un-comment the next line if you do not want to checkin 
+# TODO: Un-comment the next line if you do not want to checkin
 # your web deploy settings because they may include unencrypted
 # passwords
 #*.pubxml
@@ -244,4 +244,7 @@ ModelManifest.xml
 # FAKE - F# Make
 .fake/
 
-.DS_Store
+.DS_Store
+
+# JetBrains Rider setting files
+.idea/

src/Analyzers.xml

@@ -7819,6 +7819,80 @@ string s = """
       </Sample>
     </Samples>
   </Analyzer>
+  <Analyzer>
+    <Id>RCS1269</Id>
+    <Identifier>FixBracketFormattingOfList</Identifier>
+    <Title>Fix bracket formatting of a list</Title>
+    <MessageFormat>Fix bracket formatting of {0}</MessageFormat>
+    <DefaultSeverity>Info</DefaultSeverity>
+    <IsEnabledByDefault>false</IsEnabledByDefault>
+    <ConfigOptions>
+      <Option Key="target_braces_style" />
+    </ConfigOptions>
+    <Summary>
+      This analyzer:
+        * adds new line after an opening bracket of argument/parameter lists and similar lists
+        * adds new line before a closing bracket of argument/parameter lists and similar lists
+        * aligns the closing bracket with the block containing its opening bracket
+      The analyzer works only for multi-line declarations.
+    </Summary>
+    <Samples>
+      <Sample>
+        <Before><![CDATA[void M(object x,
+        object y)
+{
+}]]></Before>
+        <After><![CDATA[void M(
+    object x,
+    object y
+)
+{
+}]]></After>
+      </Sample>
+      <Sample>
+        <Before><![CDATA[Method(xParameter,
+    yParameter);]]></Before>
+        <After><![CDATA[Method(
+    xParameter,
+    yParameter
+);]]></After>
+      </Sample>
+    </Samples>
+  </Analyzer>
+  <Analyzer>
+    <Id>RCS1270</Id>
+    <Identifier>FixBracketFormattingOfBinaryExpression</Identifier>
+    <Title>Fix bracket formatting of a binary expression</Title>
+    <MessageFormat>Fix bracket formatting of {0}</MessageFormat>
+    <DefaultSeverity>Info</DefaultSeverity>
+    <IsEnabledByDefault>false</IsEnabledByDefault>
+    <ConfigOptions>
+      <Option Key="target_braces_style" />
+    </ConfigOptions>
+    <Summary>
+      This analyzer:
+        * adds new line after an opening bracket of binary expressions
+        * adds new line before a closing bracket of binary expressions
+        * aligns the closing bracket with the block containing its opening bracket
+      The analyzer works only for multi-line declarations.
+    </Summary>
+    <Samples>
+      <Sample>
+        <Before><![CDATA[if (x &&
+    y &&
+    z)
+{
+}]]></Before>
+        <After><![CDATA[if (
+    x
+    && y
+    && z
+)
+{
+}]]></After>
+      </Sample>
+    </Samples>
+  </Analyzer>
   <Analyzer>
     <Id>RCS9001</Id>
     <Identifier>UsePatternMatching</Identifier>

src/CSharp/DetermineParameterTypeHelper.cs

@@ -45,7 +45,7 @@ public static ImmutableArray<ITypeSymbol> DetermineParameterTypes(
 
                         if (typeSymbol?.IsErrorType() == false)
                         {
-                            (typeSymbols ??= new HashSet<ITypeSymbol>()).Add(typeSymbol);
+                            (typeSymbols ??= new HashSet<ITypeSymbol>(SymbolEqualityComparer.Default)).Add(typeSymbol);
                         }
                     }
 

src/Common/CSharp/CodeStyle/TargetBracesStyle.cs

@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Roslynator.CSharp.CodeStyle;
+
+[Flags]
+public enum TargetBracesStyle
+{
+    None,
+    Opening,
+    Closing,
+    Both = Opening | Closing,
+}

src/Common/CSharp/Extensions/CodeStyleExtensions.cs

@@ -656,6 +656,30 @@ public static NewLinePosition GetNullConditionalOperatorNewLinePosition(this Syn
         return context.GetConfigOptions().GetNullConditionalOperatorNewLinePosition(defaultValue);
     }
 
+    public static TargetBracesStyle GetTargetBracesStyle(this SyntaxNodeAnalysisContext context)
+        => context.GetConfigOptions().GetTargetBracesStyle();
+
+    public static TargetBracesStyle GetTargetBracesStyle(this AnalyzerConfigOptions configOptions)
+    {
+        if (ConfigOptions.TryGetValue(configOptions, ConfigOptions.TargetBracesStyle, out string rawValue))
+        {
+            if (string.Equals(rawValue, ConfigOptionValues.TargetBracesStyle_Both, StringComparison.OrdinalIgnoreCase))
+            {
+                return TargetBracesStyle.Both;
+            }
+            else if (string.Equals(rawValue, ConfigOptionValues.TargetBracesStyle_Closing, StringComparison.OrdinalIgnoreCase))
+            {
+                return TargetBracesStyle.Closing;
+            }
+            else if (string.Equals(rawValue, ConfigOptionValues.TargetBracesStyle_Opening, StringComparison.OrdinalIgnoreCase))
+            {
+                return TargetBracesStyle.Opening;
+            }
+        }
+
+        return TargetBracesStyle.None;
+    }
+
     private static bool TryGetNewLinePosition(
         AnalyzerConfigOptions configOptions,
         ConfigOptionDescriptor option,

src/Common/CSharp/SyntaxTriviaAnalysis.cs

@@ -111,6 +111,9 @@ public static IndentationAnalysis AnalyzeIndentation(SyntaxNode node, AnalyzerCo
     }
 
     public static SyntaxTrivia DetermineIndentation(SyntaxNodeOrToken nodeOrToken, CancellationToken cancellationToken = default)
+        => DetermineIndentation(nodeOrToken, true, cancellationToken);
+
+    public static SyntaxTrivia DetermineIndentation(SyntaxNodeOrToken nodeOrToken, bool searchInAccessors, CancellationToken cancellationToken = default)
     {
         SyntaxTree tree = nodeOrToken.SyntaxTree;
 
@@ -171,7 +174,7 @@ public static SyntaxTrivia DetermineIndentation(SyntaxNodeOrToken nodeOrToken, C
             }
         }
 
-        if (!IsMemberDeclarationOrStatementOrAccessorDeclaration(node))
+        if (searchInAccessors && !IsMemberDeclarationOrStatementOrAccessorDeclaration(node))
         {
             node = node.Parent;
 

src/Common/ConfigOptionKeys.Generated.cs

@@ -37,6 +37,7 @@ internal static partial class ConfigOptionKeys
         public const string PrefixFieldIdentifierWithUnderscore               = "roslynator_prefix_field_identifier_with_underscore";
         public const string SuppressUnityScriptMethods                        = "roslynator_suppress_unity_script_methods";
         public const string TabLength                                         = "roslynator_tab_length";
+        public const string TargetBracesStyle                                 = "roslynator_target_braces_style";
         public const string TrailingCommaStyle                                = "roslynator_trailing_comma_style";
         public const string UnityCodeAnalysisEnabled                          = "roslynator_unity_code_analysis.enabled";
         public const string UseAnonymousFunctionOrMethodGroup                 = "roslynator_use_anonymous_function_or_method_group";

src/Common/ConfigOptionValues.Generated.cs

@@ -52,6 +52,10 @@ internal static partial class ConfigOptionValues
         public const string ObjectCreationTypeStyle_Explicit                                            = "explicit";
         public const string ObjectCreationTypeStyle_Implicit                                            = "implicit";
         public const string ObjectCreationTypeStyle_ImplicitWhenTypeIsObvious                           = "implicit_when_type_is_obvious";
+        public const string TargetBracesStyle_None                                                      = "none";
+        public const string TargetBracesStyle_Opening                                                   = "opening";
+        public const string TargetBracesStyle_Closing                                                   = "closing";
+        public const string TargetBracesStyle_Both                                                      = "both";
         public const string TrailingCommaStyle_Include                                                  = "include";
         public const string TrailingCommaStyle_Omit                                                     = "omit";
         public const string TrailingCommaStyle_OmitWhenSingleLine                                       = "omit_when_single_line";

src/Common/ConfigOptions.Generated.cs

@@ -196,6 +196,12 @@ public static partial class ConfigOptions
             defaultValuePlaceholder: "<NUM>", 
             description:             "A number of spaces that are equivalent to a tab character");
 
+        public static readonly ConfigOptionDescriptor TargetBracesStyle = new(
+            key:                     ConfigOptionKeys.TargetBracesStyle, 
+            defaultValue:            "none", 
+            defaultValuePlaceholder: "both|closing|none|opening", 
+            description:             "Define which braces should be used as a target of the code fix");
+
         public static readonly ConfigOptionDescriptor TrailingCommaStyle = new(
             key:                     ConfigOptionKeys.TrailingCommaStyle, 
             defaultValue:            null, 

src/Common/DiagnosticIdentifiers.Generated.cs

@@ -280,5 +280,7 @@ public static partial class DiagnosticIdentifiers
         public const string UseRawStringLiteral = "RCS1266";
         public const string UseStringInterpolationInsteadOfStringConcat = "RCS1267";
         public const string SimplifyNumericComparison = "RCS1268";
+        public const string FixBracketFormattingOfList = "RCS1269";
+        public const string FixBracketFormattingOfBinaryExpression = "RCS1270";
     }
 }

src/Common/DiagnosticRules.Generated.cs

@@ -3323,5 +3323,29 @@ public static partial class DiagnosticRules
             helpLinkUri:        DiagnosticIdentifiers.SimplifyNumericComparison, 
             customTags:         []);
 
+        /// <summary>RCS1269</summary>
+        public static readonly DiagnosticDescriptor FixBracketFormattingOfList = DiagnosticDescriptorFactory.Create(
+            id:                 DiagnosticIdentifiers.FixBracketFormattingOfList, 
+            title:              "Fix bracket formatting of a list", 
+            messageFormat:      "Fix bracket formatting of {0}", 
+            category:           DiagnosticCategories.Roslynator, 
+            defaultSeverity:    DiagnosticSeverity.Info, 
+            isEnabledByDefault: false, 
+            description:        null, 
+            helpLinkUri:        DiagnosticIdentifiers.FixBracketFormattingOfList, 
+            customTags:         []);
+
+        /// <summary>RCS1270</summary>
+        public static readonly DiagnosticDescriptor FixBracketFormattingOfBinaryExpression = DiagnosticDescriptorFactory.Create(
+            id:                 DiagnosticIdentifiers.FixBracketFormattingOfBinaryExpression, 
+            title:              "Fix bracket formatting of a binary expression", 
+            messageFormat:      "Fix bracket formatting of {0}", 
+            category:           DiagnosticCategories.Roslynator, 
+            defaultSeverity:    DiagnosticSeverity.Info, 
+            isEnabledByDefault: false, 
+            description:        null, 
+            helpLinkUri:        DiagnosticIdentifiers.FixBracketFormattingOfBinaryExpression, 
+            customTags:         []);
+
     }
 }

src/ConfigOptions.xml

@@ -237,6 +237,15 @@
       <Value>when_type_is_obvious</Value>
     </Values>
   </Option>
+  <Option Id="TargetBracesStyle">
+    <Description>Define which braces should be used as a target of the code fix</Description>
+    <Values>
+      <Value IsDefault="true">none</Value>
+      <Value>opening</Value>
+      <Value>closing</Value>
+      <Value>both</Value>
+    </Values>
+  </Option>
   <!--
   <Option Id="">
     <Key></Key>

src/Documentation/DocumentationModel.cs

@@ -36,8 +36,8 @@ internal DocumentationModel(
         Assemblies = ImmutableArray.CreateRange(assemblies);
         Filter = filter;
 
-        _symbolData = new Dictionary<ISymbol, SymbolDocumentationData>();
-        _xmlDocumentations = new Dictionary<IAssemblySymbol, XmlDocumentation>();
+        _symbolData = new Dictionary<ISymbol, SymbolDocumentationData>(SymbolEqualityComparer.Default);
+        _xmlDocumentations = new Dictionary<IAssemblySymbol, XmlDocumentation>(SymbolEqualityComparer.Default);
 
         if (additionalXmlDocumentationPaths is not null)
             _additionalXmlDocumentationPaths = additionalXmlDocumentationPaths.ToImmutableArray();
@@ -52,8 +52,8 @@ internal DocumentationModel(
         Assemblies = compilations.Select(f => f.Assembly).ToImmutableArray();
         Filter = filter;
 
-        _symbolData = new Dictionary<ISymbol, SymbolDocumentationData>();
-        _xmlDocumentations = new Dictionary<IAssemblySymbol, XmlDocumentation>();
+        _symbolData = new Dictionary<ISymbol, SymbolDocumentationData>(SymbolEqualityComparer.Default);
+        _xmlDocumentations = new Dictionary<IAssemblySymbol, XmlDocumentation>(SymbolEqualityComparer.Default);
 
         if (additionalXmlDocumentationPaths is not null)
             _additionalXmlDocumentationPaths = additionalXmlDocumentationPaths.ToImmutableArray();
@@ -155,7 +155,7 @@ public IEnumerable<IMethodSymbol> GetExtensionMethods(INamedTypeSymbol typeSymbo
 
     public IEnumerable<INamedTypeSymbol> GetExtendedExternalTypes()
     {
-        return Iterator().Distinct();
+        return Iterator().Distinct<INamedTypeSymbol>(SymbolEqualityComparer.Default);
 
         IEnumerable<INamedTypeSymbol> Iterator()
         {
@@ -433,7 +433,17 @@ private Compilation FindCompilation(IAssemblySymbol assembly)
             return Compilations[0];
 
         if (_compilationMap is null)
-            Interlocked.CompareExchange(ref _compilationMap, Compilations.ToImmutableDictionary(f => f.Assembly, f => f), null);
+        {
+            Interlocked.CompareExchange(
+                ref _compilationMap,
+                Compilations.ToImmutableDictionary<Compilation, IAssemblySymbol, Compilation>(
+                    f => f.Assembly,
+                    f => f,
+                    SymbolEqualityComparer.Default
+                ),
+                null
+            );
+        }
 
         return _compilationMap[assembly];
     }