Skip to content

Commit 8079d9c

Browse files
committed
AST: Fix whitespace for switch statements under -print-ast.
No test changes because the tests for `-print-ast` don't match whitespace.
1 parent 7ea0723 commit 8079d9c

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

lib/AST/ASTPrinter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5648,9 +5648,10 @@ void PrintAST::visitCaseStmt(CaseStmt *CS) {
56485648
[&] { Printer << ", "; });
56495649
}
56505650
Printer << ":";
5651-
Printer.printNewline();
56525651

5653-
printASTNodes((cast<BraceStmt>(CS->getBody())->getElements()));
5652+
if (!printASTNodes((cast<BraceStmt>(CS->getBody())->getElements())))
5653+
Printer.printNewline();
5654+
indent();
56545655
}
56555656

56565657
void PrintAST::visitFailStmt(FailStmt *stmt) {

test/refactoring/AddCodableImplementation/Outputs/enum/codable.swift.expected

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ enum Payload: Codable {
2525
}
2626
switch onlyKey {
2727
case .plain:
28-
2928
let nestedContainer = try container.nestedContainer(keyedBy: Payload.PlainCodingKeys.self, forKey: Payload.CodingKeys.plain)
3029

3130
self = Payload.plain(try nestedContainer.decode(String.self, forKey: Payload.PlainCodingKeys._0))
32-
case .pair:
33-
31+
case .pair:
3432
let nestedContainer = try container.nestedContainer(keyedBy: Payload.PairCodingKeys.self, forKey: Payload.CodingKeys.pair)
3533

3634
self = Payload.pair(key: try nestedContainer.decode(String.self, forKey: Payload.PairCodingKeys.key), value: try nestedContainer.decode(String.self, forKey: Payload.PairCodingKeys.value))
@@ -42,12 +40,10 @@ enum Payload: Codable {
4240

4341
switch self {
4442
case .plain(let a0):
45-
4643
var nestedContainer = container.nestedContainer(keyedBy: Payload.PlainCodingKeys.self, forKey: Payload.CodingKeys.plain)
4744

4845
try nestedContainer.encode(a0, forKey: Payload.PlainCodingKeys._0)
49-
case .pair(let key, let value):
50-
46+
case .pair(let key, let value):
5147
var nestedContainer = container.nestedContainer(keyedBy: Payload.PairCodingKeys.self, forKey: Payload.CodingKeys.pair)
5248

5349
try nestedContainer.encode(key, forKey: Payload.PairCodingKeys.key)

test/refactoring/AddCodableImplementation/Outputs/enum/decodable.swift.expected

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ enum Payload_D: Decodable {
3030
}
3131
switch onlyKey {
3232
case .plain:
33-
3433
let nestedContainer = try container.nestedContainer(keyedBy: Payload_D.PlainCodingKeys.self, forKey: Payload_D.CodingKeys.plain)
3534

3635
self = Payload_D.plain(try nestedContainer.decode(String.self, forKey: Payload_D.PlainCodingKeys._0))
37-
case .pair:
38-
36+
case .pair:
3937
let nestedContainer = try container.nestedContainer(keyedBy: Payload_D.PairCodingKeys.self, forKey: Payload_D.CodingKeys.pair)
4038

4139
self = Payload_D.pair(key: try nestedContainer.decode(String.self, forKey: Payload_D.PairCodingKeys.key), value: try nestedContainer.decode(String.self, forKey: Payload_D.PairCodingKeys.value))

test/refactoring/AddCodableImplementation/Outputs/enum/encodable.swift.expected

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ enum Payload_E: Encodable {
3030

3131
switch self {
3232
case .plain(let a0):
33-
3433
var nestedContainer = container.nestedContainer(keyedBy: Payload_E.PlainCodingKeys.self, forKey: Payload_E.CodingKeys.plain)
3534

3635
try nestedContainer.encode(a0, forKey: Payload_E.PlainCodingKeys._0)
37-
case .pair(let key, let value):
38-
36+
case .pair(let key, let value):
3937
var nestedContainer = container.nestedContainer(keyedBy: Payload_E.PairCodingKeys.self, forKey: Payload_E.CodingKeys.pair)
4038

4139
try nestedContainer.encode(key, forKey: Payload_E.PairCodingKeys.key)

0 commit comments

Comments
 (0)