Skip to content

Commit

Permalink
Don't add a space between literals and period in BasicFormat
Browse files Browse the repository at this point in the history
Fixes apple#2344
rdar://118176218

# Conflicts:
#	Tests/SwiftBasicFormatTest/BasicFormatTests.swift
  • Loading branch information
ahoppen committed Nov 9, 2023
1 parent 6ad4ea2 commit 9ad1e77
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Sources/SwiftBasicFormat/BasicFormat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,11 @@ open class BasicFormat: SyntaxRewriter {
(.rawStringPoundDelimiter, .multilineStringQuote), // opening raw string delimiter should never be separate by a space
(.rawStringPoundDelimiter, .singleQuote), // opening raw string delimiter should never be separate by a space
(.rawStringPoundDelimiter, .stringQuote), // opening raw string delimiter should never be separate by a space
(.rawStringPoundDelimiter, .period), // opening raw string delimiter should never be separate by a space
(.regexLiteralPattern, _),
(.regexPoundDelimiter, .period), // #/myRegex/#.someMember
(.regexSlash, .regexPoundDelimiter), // closing extended regex delimiter should never be separate by a space
(.regexSlash, .period), // /myRegex/.someMember
(.rightAngle, .leftParen), // func foo<T>(x: T)
(.rightAngle, .period), // Foo<T>.bar
(.rightBrace, .leftParen), // { return 1 }()
Expand All @@ -317,6 +320,7 @@ open class BasicFormat: SyntaxRewriter {
(.rightSquare, .period), // myArray[1].someProperty
(.singleQuote, .rawStringPoundDelimiter), // closing raw string delimiter should never be separate by a space
(.stringQuote, .rawStringPoundDelimiter), // closing raw string delimiter should never be separate by a space
(.stringQuote, .period), // "test".lowercased
(.stringSegment, _),
(_, .comma),
(_, .ellipsis),
Expand Down
31 changes: 26 additions & 5 deletions Tests/SwiftBasicFormatTest/BasicFormatTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,31 @@ final class BasicFormatTest: XCTestCase {
}
}

func testRightAnglePeriodNotFormatted() {
assertFormatted(
tree: ExprSyntax("Foo<T>.bar"),
expected: "Foo<T>.bar"
)
func testPeriodAfterStringLiteral() {
let source = """
"test".lowercased()
"""
assertFormatted(source: source, expected: source)
}

func testPeriodAfterRawStringLiteral() {
let source = """
#"test"#.lowercased()
"""
assertFormatted(source: source, expected: source)
}

func testPeriodAfterRegexLiteral() {
let source = """
/test/.something
"""
assertFormatted(source: source, expected: source)
}

func testPeriodAfterRawRegexLiteral() {
let source = """
/test/.something
"""
assertFormatted(source: source, expected: source)
}
}

0 comments on commit 9ad1e77

Please sign in to comment.