Skip to content

Commit f8a45c5

Browse files
authored
Merge pull request #1612 from json-api-dotnet/formatter-primary-ctor-newline
Update formatting rules to place call to base in primary constructor on separate line
2 parents 9648cde + 51d2e49 commit f8a45c5

File tree

101 files changed

+264
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+264
-175
lines changed

JsonApiDotNetCore.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
137137
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
138138
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
139139
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
140+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_PRIMARY_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
140141
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
141142
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
142143
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>

src/Examples/DapperExample/Controllers/OperationsController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ namespace DapperExample.Controllers;
88

99
public sealed class OperationsController(
1010
IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request,
11-
ITargetedFields targetedFields, IAtomicOperationFilter operationFilter) : JsonApiOperationsController(options, resourceGraph, loggerFactory, processor,
12-
request, targetedFields, operationFilter);
11+
ITargetedFields targetedFields, IAtomicOperationFilter operationFilter)
12+
: JsonApiOperationsController(options, resourceGraph, loggerFactory, processor, request, targetedFields, operationFilter);

src/Examples/DapperExample/TranslationToSql/Builders/DeleteOneToOneStatementBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
namespace DapperExample.TranslationToSql.Builders;
88

9-
internal sealed class DeleteOneToOneStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
9+
internal sealed class DeleteOneToOneStatementBuilder(IDataModelService dataModelService)
10+
: StatementBuilder(dataModelService)
1011
{
1112
public DeleteNode Build(ResourceType resourceType, string whereColumnName, object? whereValue)
1213
{

src/Examples/DapperExample/TranslationToSql/Builders/DeleteResourceStatementBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
namespace DapperExample.TranslationToSql.Builders;
99

10-
internal sealed class DeleteResourceStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
10+
internal sealed class DeleteResourceStatementBuilder(IDataModelService dataModelService)
11+
: StatementBuilder(dataModelService)
1112
{
1213
public DeleteNode Build(ResourceType resourceType, params object[] idValues)
1314
{

src/Examples/DapperExample/TranslationToSql/Builders/InsertStatementBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
namespace DapperExample.TranslationToSql.Builders;
99

10-
internal sealed class InsertStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
10+
internal sealed class InsertStatementBuilder(IDataModelService dataModelService)
11+
: StatementBuilder(dataModelService)
1112
{
1213
public InsertNode Build(ResourceType resourceType, IReadOnlyDictionary<string, object?> columnsToSet)
1314
{

src/Examples/DapperExample/TranslationToSql/Builders/UpdateClearOneToOneStatementBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
namespace DapperExample.TranslationToSql.Builders;
88

9-
internal sealed class UpdateClearOneToOneStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
9+
internal sealed class UpdateClearOneToOneStatementBuilder(IDataModelService dataModelService)
10+
: StatementBuilder(dataModelService)
1011
{
1112
public UpdateNode Build(ResourceType resourceType, string setColumnName, string whereColumnName, object? whereValue)
1213
{

src/Examples/DapperExample/TranslationToSql/Builders/UpdateResourceStatementBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
namespace DapperExample.TranslationToSql.Builders;
99

10-
internal sealed class UpdateResourceStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
10+
internal sealed class UpdateResourceStatementBuilder(IDataModelService dataModelService)
11+
: StatementBuilder(dataModelService)
1112
{
1213
public UpdateNode Build(ResourceType resourceType, IReadOnlyDictionary<string, object?> columnsToUpdate, params object[] idValues)
1314
{

src/Examples/DapperExample/TranslationToSql/DataModel/FromEntitiesDataModelService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace DapperExample.TranslationToSql.DataModel;
1212
/// <summary>
1313
/// Derives foreign keys and connection strings from an existing Entity Framework Core model.
1414
/// </summary>
15-
public sealed class FromEntitiesDataModelService(IResourceGraph resourceGraph) : BaseDataModelService(resourceGraph)
15+
public sealed class FromEntitiesDataModelService(IResourceGraph resourceGraph)
16+
: BaseDataModelService(resourceGraph)
1617
{
1718
private readonly Dictionary<RelationshipAttribute, RelationshipForeignKey> _foreignKeysByRelationship = [];
1819
private readonly Dictionary<AttrAttribute, bool> _columnNullabilityPerAttribute = [];

src/Examples/DapperExample/TranslationToSql/Generators/ParameterGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ public void Reset()
2020
_nameGenerator.Reset();
2121
}
2222

23-
private sealed class ParameterNameGenerator() : UniqueNameGenerator("@p");
23+
private sealed class ParameterNameGenerator()
24+
: UniqueNameGenerator("@p");
2425
}

src/Examples/DapperExample/TranslationToSql/Generators/TableAliasGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ namespace DapperExample.TranslationToSql.Generators;
33
/// <summary>
44
/// Generates a SQL table alias with a unique name.
55
/// </summary>
6-
internal sealed class TableAliasGenerator() : UniqueNameGenerator("t");
6+
internal sealed class TableAliasGenerator()
7+
: UniqueNameGenerator("t");

0 commit comments

Comments
 (0)