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

Fix highlighting for keywords used as generic function parameter labels (#65)

Browse Source 
This patch fixes highlighting for parameter labels that also match a
keyword, when used within a generic function declaration.
This commit is contained in:
John Sundell 2019-03-31 22:52:09 +02:00 committed by GitHub
parent c05038072a
commit 2b9e65e0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 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

@ -271,7 +271,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") {
guard !previousToken.isAny(of: "(", ",") else {
guard !previousToken.isAny(of: "(", ",", ">(") else {
return false
}
}

21
Tests/SplashTests/Tests/DeclarationTests.swift
View File

@ -88,6 +88,26 @@ final class DeclarationTests: SyntaxHighlighterTestCase {
])
}
func testGenericFunctionDeclarationWithKeywordArgumentLabel() {
let components = highlighter.highlight("func perform<O: AnyObject>(for object: O) {}")
XCTAssertEqual(components, [
.token("func", .keyword),
.whitespace(" "),
.plainText("perform<O:"),
.whitespace(" "),
.token("AnyObject", .type),
.plainText(">(for"),
.whitespace(" "),
.plainText("object:"),
.whitespace(" "),
.token("O", .type),
.plainText(")"),
.whitespace(" "),
.plainText("{}")
])
}
func testGenericFunctionDeclarationWithoutConstraints() {
let components = highlighter.highlight("func hello<A, B>(a: A, b: B)")
@ -857,6 +877,7 @@ extension DeclarationTests {
("testPublicFunctionDeclarationWithDocumentationEndingWithDot", testPublicFunctionDeclarationWithDocumentationEndingWithDot),
("testFunctionDeclarationWithEmptyExternalLabel", testFunctionDeclarationWithEmptyExternalLabel),
("testFunctionDeclarationWithKeywordArgumentLabel", testFunctionDeclarationWithKeywordArgumentLabel),
("testGenericFunctionDeclarationWithKeywordArgumentLabel", testGenericFunctionDeclarationWithKeywordArgumentLabel),
("testGenericFunctionDeclarationWithoutConstraints", testGenericFunctionDeclarationWithoutConstraints),
("testGenericFunctionDeclarationWithSingleConstraint", testGenericFunctionDeclarationWithSingleConstraint),
("testGenericFunctionDeclarationWithMultipleConstraints", testGenericFunctionDeclarationWithMultipleConstraints),