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

Fix highlighting for inout closure arguments (#68)

Browse Source 
This patch makes Splash correctly highlight the `inout` keyword when
it appears as part of a closure argument definition.
This commit is contained in:
John Sundell 2019-05-13 11:19:15 +02:00 committed by GitHub
parent 30d6cacb7c
commit 4675ffe963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,7 @@ private extension SwiftGrammar {
}
// Don't highlight most keywords when used as a parameter label
if !segment.tokens.current.isAny(of: "_", "self", "let", "var", "true", "false") {
if !segment.tokens.current.isAny(of: "_", "self", "let", "var", "true", "false", "inout") {
guard !previousToken.isAny(of: "(", ",", ">(") else {
return false
}

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

@ -110,6 +110,27 @@ final class ClosureTests: SyntaxHighlighterTestCase {
])
}
func testClosureWithInoutArgument() {
let components = highlighter.highlight("func add(closure: (inout Value) -> Void)")
XCTAssertEqual(components, [
.token("func", .keyword),
.whitespace(" "),
.plainText("add(closure:"),
.whitespace(" "),
.plainText("("),
.token("inout", .keyword),
.whitespace(" "),
.token("Value", .type),
.plainText(")"),
.whitespace(" "),
.plainText("->"),
.whitespace(" "),
.token("Void", .type),
.plainText(")")
])
}
func testPassingClosureAsArgument() {
let components = highlighter.highlight("object.call({ $0 })")
@ -194,6 +215,7 @@ extension ClosureTests {
("testClosureArgumentWithSingleArgument", testClosureArgumentWithSingleArgument),
("testClosureArgumentWithMultipleArguments", testClosureArgumentWithMultipleArguments),
("testEscapingClosureArgument", testEscapingClosureArgument),
("testClosureWithInoutArgument", testClosureWithInoutArgument),
("testPassingClosureAsArgument", testPassingClosureAsArgument),
("testNestedEscapingClosure", testNestedEscapingClosure),
("testClosureArgumentShorthands", testClosureArgumentShorthands)