Skip to content

Commit 195823b

Browse files
bnbarhambnbarham
committed
BasicFormat should add spacing around { and }
We now properly strip trailing whitespace. Add in spacing after `{` and before `}`.
1 parent ccc812e commit 195823b

File tree

13 files changed

+250
-237
lines changed

13 files changed

+250
-237
lines changed

‎Sources/SwiftBasicFormat/BasicFormat.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ open class BasicFormat: SyntaxRewriter {
213213
(.keyword(.set), .leftParen), // var mYar: Int { set(value) {} }
214214
(.keyword(.subscript), .leftParen), // subscript(x: Int)
215215
(.keyword(.super), .period), // super.someProperty
216-
(.leftBrace, _),
216+
(.leftBrace, .rightBrace), // {}
217217
(.leftParen, _),
218218
(.leftSquare, _),
219219
(.multilineStringQuote, .rawStringDelimiter), // closing raw string delimiter should never be separate by a space
@@ -245,7 +245,6 @@ open class BasicFormat: SyntaxRewriter {
245245
(_, .exclamationMark),
246246
(_, .postfixOperator),
247247
(_, .postfixQuestionMark),
248-
(_, .rightBrace),
249248
(_, .rightParen),
250249
(_, .rightSquare),
251250
(_, .semicolon),

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public struct AccessorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
7171
unexpectedBetweenInitEffectsAndBody,
7272
body,
7373
unexpectedAfterBody
74-
))) {(arena, _) in
74+
))) { (arena, _) in
7575
let layout: [RawSyntax?] = [
7676
unexpectedBeforeAttributes?.raw,
7777
attributes?.raw,
@@ -340,7 +340,7 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
340340
unexpectedBetweenGenericWhereClauseAndMemberBlock,
341341
memberBlock,
342342
unexpectedAfterMemberBlock
343-
))) {(arena, _) in
343+
))) { (arena, _) in
344344
let layout: [RawSyntax?] = [
345345
unexpectedBeforeAttributes?.raw,
346346
attributes?.raw,
@@ -668,7 +668,7 @@ public struct AssociatedtypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
668668
unexpectedBetweenInitializerAndGenericWhereClause,
669669
genericWhereClause,
670670
unexpectedAfterGenericWhereClause
671-
))) {(arena, _) in
671+
))) { (arena, _) in
672672
let layout: [RawSyntax?] = [
673673
unexpectedBeforeAttributes?.raw,
674674
attributes?.raw,
@@ -983,7 +983,7 @@ public struct ClassDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
983983
unexpectedBetweenGenericWhereClauseAndMemberBlock,
984984
memberBlock,
985985
unexpectedAfterMemberBlock
986-
))) {(arena, _) in
986+
))) { (arena, _) in
987987
let layout: [RawSyntax?] = [
988988
unexpectedBeforeAttributes?.raw,
989989
attributes?.raw,
@@ -1290,7 +1290,7 @@ public struct DeinitializerDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
12901290
unexpectedBetweenDeinitKeywordAndBody,
12911291
body,
12921292
unexpectedAfterBody
1293-
))) {(arena, _) in
1293+
))) { (arena, _) in
12941294
let layout: [RawSyntax?] = [
12951295
unexpectedBeforeAttributes?.raw,
12961296
attributes?.raw,
@@ -1496,7 +1496,7 @@ public struct EditorPlaceholderDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
14961496
unexpectedBetweenModifiersAndPlaceholder,
14971497
placeholder,
14981498
unexpectedAfterPlaceholder
1499-
))) {(arena, _) in
1499+
))) { (arena, _) in
15001500
let layout: [RawSyntax?] = [
15011501
unexpectedBeforeAttributes?.raw,
15021502
attributes?.raw,
@@ -1683,7 +1683,7 @@ public struct EnumCaseDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
16831683
unexpectedBetweenCaseKeywordAndElements,
16841684
elements,
16851685
unexpectedAfterElements
1686-
))) {(arena, _) in
1686+
))) { (arena, _) in
16871687
let layout: [RawSyntax?] = [
16881688
unexpectedBeforeAttributes?.raw,
16891689
attributes?.raw,
@@ -1928,7 +1928,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
19281928
unexpectedBetweenGenericWhereClauseAndMemberBlock,
19291929
memberBlock,
19301930
unexpectedAfterMemberBlock
1931-
))) {(arena, _) in
1931+
))) { (arena, _) in
19321932
let layout: [RawSyntax?] = [
19331933
unexpectedBeforeAttributes?.raw,
19341934
attributes?.raw,
@@ -2242,7 +2242,7 @@ public struct ExtensionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
22422242
unexpectedBetweenGenericWhereClauseAndMemberBlock,
22432243
memberBlock,
22442244
unexpectedAfterMemberBlock
2245-
))) {(arena, _) in
2245+
))) { (arena, _) in
22462246
let layout: [RawSyntax?] = [
22472247
unexpectedBeforeAttributes?.raw,
22482248
attributes?.raw,
@@ -2530,7 +2530,7 @@ public struct FunctionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
25302530
unexpectedBetweenGenericWhereClauseAndBody,
25312531
body,
25322532
unexpectedAfterBody
2533-
))) {(arena, _) in
2533+
))) { (arena, _) in
25342534
let layout: [RawSyntax?] = [
25352535
unexpectedBeforeAttributes?.raw,
25362536
attributes?.raw,
@@ -2816,7 +2816,7 @@ public struct IfConfigDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
28162816
unexpectedBetweenClausesAndPoundEndif,
28172817
poundEndif,
28182818
unexpectedAfterPoundEndif
2819-
))) {(arena, _) in
2819+
))) { (arena, _) in
28202820
let layout: [RawSyntax?] = [
28212821
unexpectedBeforeClauses?.raw,
28222822
clauses.raw,
@@ -2967,7 +2967,7 @@ public struct ImportDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
29672967
unexpectedBetweenImportKindAndPath,
29682968
path,
29692969
unexpectedAfterPath
2970-
))) {(arena, _) in
2970+
))) { (arena, _) in
29712971
let layout: [RawSyntax?] = [
29722972
unexpectedBeforeAttributes?.raw,
29732973
attributes?.raw,
@@ -3242,7 +3242,7 @@ public struct InitializerDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
32423242
unexpectedBetweenGenericWhereClauseAndBody,
32433243
body,
32443244
unexpectedAfterBody
3245-
))) {(arena, _) in
3245+
))) { (arena, _) in
32463246
let layout: [RawSyntax?] = [
32473247
unexpectedBeforeAttributes?.raw,
32483248
attributes?.raw,
@@ -3560,7 +3560,7 @@ public struct MacroDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
35603560
unexpectedBetweenDefinitionAndGenericWhereClause,
35613561
genericWhereClause,
35623562
unexpectedAfterGenericWhereClause
3563-
))) {(arena, _) in
3563+
))) { (arena, _) in
35643564
let layout: [RawSyntax?] = [
35653565
unexpectedBeforeAttributes?.raw,
35663566
attributes?.raw,
@@ -3878,7 +3878,7 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
38783878
unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures,
38793879
additionalTrailingClosures,
38803880
unexpectedAfterAdditionalTrailingClosures
3881-
))) {(arena, _) in
3881+
))) { (arena, _) in
38823882
let layout: [RawSyntax?] = [
38833883
unexpectedBeforeAttributes?.raw,
38843884
attributes?.raw,
@@ -4251,7 +4251,7 @@ public struct MissingDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
42514251
unexpectedBetweenModifiersAndPlaceholder,
42524252
placeholder,
42534253
unexpectedAfterPlaceholder
4254-
))) {(arena, _) in
4254+
))) { (arena, _) in
42554255
let layout: [RawSyntax?] = [
42564256
unexpectedBeforeAttributes?.raw,
42574257
attributes?.raw,
@@ -4438,7 +4438,7 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
44384438
unexpectedBetweenIdentifierAndOperatorPrecedenceAndTypes,
44394439
operatorPrecedenceAndTypes,
44404440
unexpectedAfterOperatorPrecedenceAndTypes
4441-
))) {(arena, _) in
4441+
))) { (arena, _) in
44424442
let layout: [RawSyntax?] = [
44434443
unexpectedBeforeFixity?.raw,
44444444
fixity.raw,
@@ -4608,7 +4608,7 @@ public struct PoundSourceLocationSyntax: DeclSyntaxProtocol, SyntaxHashable {
46084608
unexpectedBetweenArgsAndRightParen,
46094609
rightParen,
46104610
unexpectedAfterRightParen
4611-
))) {(arena, _) in
4611+
))) { (arena, _) in
46124612
let layout: [RawSyntax?] = [
46134613
unexpectedBeforePoundSourceLocation?.raw,
46144614
poundSourceLocation.raw,
@@ -4788,7 +4788,7 @@ public struct PrecedenceGroupDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
47884788
unexpectedBetweenGroupAttributesAndRightBrace,
47894789
rightBrace,
47904790
unexpectedAfterRightBrace
4791-
))) {(arena, _) in
4791+
))) { (arena, _) in
47924792
let layout: [RawSyntax?] = [
47934793
unexpectedBeforeAttributes?.raw,
47944794
attributes?.raw,
@@ -5105,7 +5105,7 @@ public struct ProtocolDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
51055105
unexpectedBetweenGenericWhereClauseAndMemberBlock,
51065106
memberBlock,
51075107
unexpectedAfterMemberBlock
5108-
))) {(arena, _) in
5108+
))) { (arena, _) in
51095109
let layout: [RawSyntax?] = [
51105110
unexpectedBeforeAttributes?.raw,
51115111
attributes?.raw,
@@ -5477,7 +5477,7 @@ public struct StructDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
54775477
unexpectedBetweenGenericWhereClauseAndMemberBlock,
54785478
memberBlock,
54795479
unexpectedAfterMemberBlock
5480-
))) {(arena, _) in
5480+
))) { (arena, _) in
54815481
let layout: [RawSyntax?] = [
54825482
unexpectedBeforeAttributes?.raw,
54835483
attributes?.raw,
@@ -5837,7 +5837,7 @@ public struct SubscriptDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
58375837
unexpectedBetweenGenericWhereClauseAndAccessor,
58385838
accessor,
58395839
unexpectedAfterAccessor
5840-
))) {(arena, _) in
5840+
))) { (arena, _) in
58415841
let layout: [RawSyntax?] = [
58425842
unexpectedBeforeAttributes?.raw,
58435843
attributes?.raw,
@@ -6143,7 +6143,7 @@ public struct TypealiasDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
61436143
unexpectedBetweenInitializerAndGenericWhereClause,
61446144
genericWhereClause,
61456145
unexpectedAfterGenericWhereClause
6146-
))) {(arena, _) in
6146+
))) { (arena, _) in
61476147
let layout: [RawSyntax?] = [
61486148
unexpectedBeforeAttributes?.raw,
61496149
attributes?.raw,
@@ -6415,7 +6415,7 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
64156415
unexpectedBetweenBindingKeywordAndBindings,
64166416
bindings,
64176417
unexpectedAfterBindings
6418-
))) {(arena, _) in
6418+
))) { (arena, _) in
64196419
let layout: [RawSyntax?] = [
64206420
unexpectedBeforeAttributes?.raw,
64216421
attributes?.raw,

0 commit comments

Comments
 (0)