shadowfacts/splash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for multi-line Swift 5 raw strings (#53)

Browse Source 
This change extends the support for Swift 5 raw strings
to also cover multi-line literals.
This commit is contained in:
John Sundell 2019-03-12 00:34:56 +01:00 committed by GitHub
parent 6a75ec4491
commit f1c56b342d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Splash/Grammar/SwiftGrammar.swift
View File

@ -103,7 +103,13 @@ private extension SwiftGrammar {
var tokenType: TokenType { return .string }
func matches(_ segment: Segment) -> Bool {
return segment.isWithinStringLiteral(withStart: "#\"", end: "\"#")
if segment.isWithinStringLiteral(withStart: "#\"", end: "\"#") {
return true
}
let multiLineStartCount = segment.tokens.count(of: "#\"\"\"")
let multiLineEndCount = segment.tokens.count(of: "\"\"\"#")
return multiLineStartCount != multiLineEndCount
}
}

36
Tests/SplashTests/Tests/LiteralTests.swift
View File

@ -118,6 +118,41 @@ final class LiteralTests: SyntaxHighlighterTestCase {
])
}
func testMultiLineRawStringLiteral() {
let components = highlighter.highlight("""
#\"\"\"
A raw string \\(withoutInterpolation)
with multiple lines. #" Nested "#
\"\"\"#
""")
XCTAssertEqual(components, [
.token("#\"\"\"", .string),
.whitespace("\n"),
.token("A", .string),
.whitespace(" "),
.token("raw", .string),
.whitespace(" "),
.token("string", .string),
.whitespace(" "),
.token("\\(withoutInterpolation)", .string),
.whitespace("\n"),
.token("with", .string),
.whitespace(" "),
.token("multiple", .string),
.whitespace(" "),
.token("lines.", .string),
.whitespace(" "),
.token("#\"", .string),
.whitespace(" "),
.token("Nested", .string),
.whitespace(" "),
.token("\"#", .string),
.whitespace("\n"),
.token("\"\"\"#", .string)
])
}
func testDoubleLiteral() {
let components = highlighter.highlight("let double = 1.13")
@ -161,6 +196,7 @@ extension LiteralTests {
("testStringLiteralInterpolation", testStringLiteralInterpolation),
("testMultiLineStringLiteral", testMultiLineStringLiteral),
("testSingleLineRawStringLiteral", testSingleLineRawStringLiteral),
("testMultiLineRawStringLiteral", testMultiLineRawStringLiteral),
("testDoubleLiteral", testDoubleLiteral),
("testIntegerLiteralWithSeparators", testIntegerLiteralWithSeparators)
]