Skip to content

Commit 210f4fe

Browse files
committed
Use fixedUp instead
1 parent 603cd26 commit 210f4fe

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ extension FixIt.MultiNodeChange {
167167
}
168168
}
169169

170-
if let previousToken = node.previousToken(viewMode: .all),
170+
if let previousToken = node.previousToken(viewMode: .fixedUp),
171171
previousToken.presence == .present,
172172
let firstToken = node.firstToken(viewMode: .all),
173173
previousToken.trailingTrivia.allSatisfy({ $0.isWhitespace }),

Tests/SwiftParserTest/translated/AvailabilityQueryTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ final class AvailabilityQueryTests: XCTestCase {
9696
DiagnosticSpec(message: "expected ',' joining parts of a multi-clause condition", fixIts: ["replace '&&' with ','"])
9797
],
9898
fixedSource: """
99-
if #available(OSX 10.51, *) , #available(OSX 10.52, *) {
99+
if #available(OSX 10.51, *), #available(OSX 10.52, *) {
100100
}
101101
"""
102102
)
@@ -393,7 +393,7 @@ final class AvailabilityQueryTests: XCTestCase {
393393
DiagnosticSpec(message: "expected ',' joining platforms in availability condition", fixIts: ["replace '||' with ','"])
394394
],
395395
fixedSource: """
396-
if #available(OSX 10.51 , iOS 8.0) {
396+
if #available(OSX 10.51, iOS 8.0) {
397397
}
398398
"""
399399
)

Tests/SwiftParserTest/translated/AvailabilityQueryUnavailabilityTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ final class AvailabilityQueryUnavailabilityTests: XCTestCase {
395395
DiagnosticSpec(message: "expected ',' joining platforms in availability condition", fixIts: ["replace '||' with ','"])
396396
],
397397
fixedSource: """
398-
if #unavailable(OSX 10.51 , iOS 8.0) {
398+
if #unavailable(OSX 10.51, iOS 8.0) {
399399
}
400400
"""
401401
)

Tests/SwiftParserTest/translated/MultilineErrorsTests.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,7 @@ final class MultilineErrorsTests: XCTestCase {
518518
DiagnosticSpec(message: "escaped newline at the last line of a multi-line string literal is not allowed", fixIts: ["remove ''"])
519519
],
520520
fixedSource: #"""
521-
_ = """
522-
\\
521+
_ = """ \\
523522
"""
524523
"""#
525524
)
@@ -554,8 +553,7 @@ final class MultilineErrorsTests: XCTestCase {
554553
DiagnosticSpec(message: "escaped newline at the last line of a multi-line string literal is not allowed", fixIts: ["remove ''"])
555554
],
556555
fixedSource: #"""
557-
_ = """
558-
foo
556+
_ = """ foo
559557
"""
560558
"""#
561559
)
@@ -572,8 +570,7 @@ final class MultilineErrorsTests: XCTestCase {
572570
DiagnosticSpec(message: "escaped newline at the last line of a multi-line string literal is not allowed", fixIts: ["remove ''"])
573571
],
574572
fixedSource: #"""
575-
_ = """
576-
foo
573+
_ = """ foo
577574
"""
578575
"""#
579576
)
@@ -603,8 +600,7 @@ final class MultilineErrorsTests: XCTestCase {
603600
DiagnosticSpec(message: "escaped newline at the last line of a multi-line string literal is not allowed", fixIts: ["remove ''"])
604601
],
605602
fixedSource: #"""
606-
_ = """
607-
\#u{20}
603+
_ = """\#u{20}
608604
"""
609605
"""#
610606
)

Tests/SwiftParserTest/translated/RecoveryTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,7 @@ final class RecoveryTests: XCTestCase {
19251925
fixIts: ["replace 'where' with ','"])
19261926
],
19271927
fixedSource: """
1928-
if let y = x , y == 0, let z = x {
1928+
if let y = x, y == 0, let z = x {
19291929
_ = y
19301930
_ = z
19311931
}

0 commit comments

Comments
 (0)