Skip to content

Fix CodeGenerationFormat to correctly indent LabeledExprListSyntax in method calls that start on a new line #2851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Fix CodeGenerationFormat to correctly indent LabeledExprListSyntax in method calls that start on a new line #2851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions CodeGeneration/Sources/Utils/CodeGenerationFormat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,18 @@ public class CodeGenerationFormat: BasicFormat {
let children = node.children(viewMode: .all)
// Short tuple element list literals are presented on one line, list each element on a different line.
if children.count > maxElementsOnSameLine {
let inMethodCallThatStartsOnNewline =
node.parent?.as(FunctionCallExprSyntax.self)?.calledExpression.as(MemberAccessExprSyntax.self)?.period
.startsOnNewline ?? false
if inMethodCallThatStartsOnNewline {
increaseIndentationLevel()
}
defer {
if inMethodCallThatStartsOnNewline {
decreaseIndentationLevel()
}
}

return LabeledExprListSyntax(
formatChildrenSeparatedByNewline(children: children, elementType: LabeledExprSyntax.self)
)
Expand All @@ -111,10 +123,7 @@ public class CodeGenerationFormat: BasicFormat {
if indentManually {
return false
}
let startsOnNewline =
node.leadingTrivia.contains(where: \.isNewline)
|| node.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false
if !startsOnNewline {
if !node.startsOnNewline {
return false
}
default:
Expand Down Expand Up @@ -151,11 +160,7 @@ public class CodeGenerationFormat: BasicFormat {
var child = child
child.trailingTrivia = Trivia(pieces: child.trailingTrivia.drop(while: \.isSpaceOrTab))

let startsOnNewline =
child.leadingTrivia.contains(where: \.isNewline)
|| child.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false

if !startsOnNewline {
if !child.startsOnNewline {
child.leadingTrivia = indentedNewline + child.leadingTrivia
}
return child
Expand All @@ -174,3 +179,10 @@ public class CodeGenerationFormat: BasicFormat {
return formattedChildren
}
}

private extension SyntaxProtocol {
var startsOnNewline: Bool {
return self.leadingTrivia.contains(where: \.isNewline)
|| self.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false
}
}
100 changes: 50 additions & 50 deletions Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,11 +369,11 @@ public struct AccessorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _LeafDeclS
}
return Syntax(self)
.replacingChild(
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(AccessorDeclSyntax.self)
}

Expand Down Expand Up @@ -918,11 +918,11 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _LeafDeclSynt
}
return Syntax(self)
.replacingChild(
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(ActorDeclSyntax.self)
}

Expand Down Expand Up @@ -964,11 +964,11 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _LeafDeclSynt
}
return Syntax(self)
.replacingChild(
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(ActorDeclSyntax.self)
}

Expand Down Expand Up @@ -1362,11 +1362,11 @@ public struct ArrayExprSyntax: ExprSyntaxProtocol, SyntaxHashable, _LeafExprSynt
}
return Syntax(self)
.replacingChild(
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(ArrayExprSyntax.self)
}

Expand Down Expand Up @@ -2095,11 +2095,11 @@ public struct AssociatedTypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _Lea
}
return Syntax(self)
.replacingChild(
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(AssociatedTypeDeclSyntax.self)
}

Expand Down Expand Up @@ -2141,11 +2141,11 @@ public struct AssociatedTypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _Lea
}
return Syntax(self)
.replacingChild(
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(AssociatedTypeDeclSyntax.self)
}

Expand Down Expand Up @@ -3264,11 +3264,11 @@ public struct AttributedTypeSyntax: TypeSyntaxProtocol, SyntaxHashable, _LeafTyp
}
return Syntax(self)
.replacingChild(
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 1,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(AttributedTypeSyntax.self)
}

Expand Down Expand Up @@ -3310,11 +3310,11 @@ public struct AttributedTypeSyntax: TypeSyntaxProtocol, SyntaxHashable, _LeafTyp
}
return Syntax(self)
.replacingChild(
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 3,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(AttributedTypeSyntax.self)
}

Expand Down Expand Up @@ -3750,11 +3750,11 @@ public struct AvailabilityConditionSyntax: SyntaxProtocol, SyntaxHashable, _Leaf
}
return Syntax(self)
.replacingChild(
at: 5,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 5,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(AvailabilityConditionSyntax.self)
}

Expand Down Expand Up @@ -4309,11 +4309,11 @@ public struct BackDeployedAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashab
}
return Syntax(self)
.replacingChild(
at: 5,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
at: 5,
with: collection,
rawNodeArena: arena,
allocationArena: arena
)
.cast(BackDeployedAttributeArgumentsSyntax.self)
}

Expand Down
Loading