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

Fix highlighting for nested escaping closures (#62)

Browse Source 
This patch makes Splash correctly highlight nested closures marked with
the `@escaping` attribute. The fix is to start treating `@` like a proper
token, rather than as a delimiter.
This commit is contained in:
John Sundell 2019-03-24 11:35:33 +01:00 committed by GitHub
parent 72837ce7f0
commit b9177c4104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ public struct SwiftGrammar: Grammar {
delimiters.remove("_")
delimiters.remove("\"")
delimiters.remove("#")
delimiters.remove("@")
self.delimiters = delimiters
syntaxRules = [
@ -96,7 +97,7 @@ private extension SwiftGrammar {
var tokenType: TokenType { return .keyword }
func matches(_ segment: Segment) -> Bool {
return segment.tokens.current == "@" || segment.tokens.previous == "@"
return segment.tokens.current.hasPrefix("@")
}
}

30
Tests/SplashTests/Tests/ClosureTests.swift
View File

@ -124,6 +124,33 @@ final class ClosureTests: SyntaxHighlighterTestCase {
])
}
func testNestedEscapingClosure() {
let components = highlighter.highlight("let closures = [(@escaping () -> Void) -> Void]()")
XCTAssertEqual(components, [
.token("let", .keyword),
.whitespace(" "),
.plainText("closures"),
.whitespace(" "),
.plainText("="),
.whitespace(" "),
.plainText("[("),
.token("@escaping", .keyword),
.whitespace(" "),
.plainText("()"),
.whitespace(" "),
.plainText("->"),
.whitespace(" "),
.token("Void", .type),
.plainText(")"),
.whitespace(" "),
.plainText("->"),
.whitespace(" "),
.token("Void", .type),
.plainText("]()")
])
}
func testAllTestsRunOnLinux() {
XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
}
@ -138,7 +165,8 @@ extension ClosureTests {
("testClosureArgumentWithSingleArgument", testClosureArgumentWithSingleArgument),
("testClosureArgumentWithMultipleArguments", testClosureArgumentWithMultipleArguments),
("testEscapingClosureArgument", testEscapingClosureArgument),
("testPassingClosureAsArgument", testPassingClosureAsArgument)
("testPassingClosureAsArgument", testPassingClosureAsArgument),
("testNestedEscapingClosure", testNestedEscapingClosure)
]
}
}