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

Correctly highlight generic parameters (#59)

Browse Source 
This patch makes Splash highlight generics that appear as part of a
generic function’s parameter list in a correct way.
This commit is contained in:
John Sundell 2019-03-16 12:41:53 +01:00 committed by GitHub
parent e3477a428e
commit 2cdc99ce60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,11 @@ private extension SwiftGrammar {
foundOpeningBracket = true
}
// Handling generic lists for parameters, rather than declarations
if foundOpeningBracket && token == ":" {
return true
}
guard !declarationKeywords.contains(token) else {
// If it turns out that we weren't in fact inside of a generic
// declaration, (lacking "<"), then highlight the type as normal.

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

@ -150,6 +150,33 @@ final class DeclarationTests: SyntaxHighlighterTestCase {
])
}
func testGenericFunctionDeclarationWithGenericParameter() {
let components = highlighter.highlight("func value<T>(at keyPath: KeyPath<Element, T>) -> T? {}")
XCTAssertEqual(components, [
.token("func", .keyword),
.whitespace(" "),
.plainText("value<T>(at"),
.whitespace(" "),
.plainText("keyPath:"),
.whitespace(" "),
.token("KeyPath", .type),
.plainText("<"),
.token("Element", .type),
.plainText(","),
.whitespace(" "),
.token("T", .type),
.plainText(">)"),
.whitespace(" "),
.plainText("->"),
.whitespace(" "),
.token("T", .type),
.plainText("?"),
.whitespace(" "),
.plainText("{}")
])
}
func testGenericStructDeclaration() {
let components = highlighter.highlight("struct MyStruct<A: Hello, B> {}")
@ -833,6 +860,7 @@ extension DeclarationTests {
("testGenericFunctionDeclarationWithoutConstraints", testGenericFunctionDeclarationWithoutConstraints),
("testGenericFunctionDeclarationWithSingleConstraint", testGenericFunctionDeclarationWithSingleConstraint),
("testGenericFunctionDeclarationWithMultipleConstraints", testGenericFunctionDeclarationWithMultipleConstraints),
("testGenericFunctionDeclarationWithGenericParameter", testGenericFunctionDeclarationWithGenericParameter),
("testGenericStructDeclaration", testGenericStructDeclaration),
("testClassDeclaration", testClassDeclaration),
("testCompactClassDeclarationWithInitializer", testCompactClassDeclarationWithInitializer),