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

Support types and functions named with a leading underscore (#74)

Browse Source 
This patch fixes syntax highlighting for types and functions which names
begin with an underscore. Previously these entities would be treated as
plain text, but now they’re highlighted correctly as either types or
function calls.
This commit is contained in:
John Sundell 2019-07-17 10:57:44 +02:00 committed by GitHub
parent b1f77c9ff1
commit 370f685cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,11 @@ private extension SwiftGrammar {
}
func matches(_ segment: Segment) -> Bool {
guard segment.tokens.current.startsWithLetter else {
let token = segment.tokens.current.trimmingCharacters(
in: CharacterSet(charactersIn: "_")
)
guard token.startsWithLetter else {
return false
}
@ -305,7 +309,11 @@ private extension SwiftGrammar {
}
}
guard segment.tokens.current.isCapitalized else {
let token = segment.tokens.current.trimmingCharacters(
in: CharacterSet(charactersIn: "_")
)
guard token.isCapitalized else {
return false
}
@ -316,7 +324,7 @@ private extension SwiftGrammar {
// The XCTAssert family of functions is a bit of an edge case,
// since they start with capital letters. Since they are so
// commonly used, we'll add a special case for them here:
guard !segment.tokens.current.starts(with: "XCTAssert") else {
guard !token.starts(with: "XCTAssert") else {
return false
}

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

@ -330,6 +330,24 @@ final class StatementTests: SyntaxHighlighterTestCase {
])
}
func testInitializingTypeWithLeadingUnderscore() {
let components = highlighter.highlight("_MyType()")
XCTAssertEqual(components, [
.token("_MyType", .type),
.plainText("()")
])
}
func testCallingFunctionWithLeadingUnderscore() {
let components = highlighter.highlight("_myFunction()")
XCTAssertEqual(components, [
.token("_myFunction", .call),
.plainText("()")
])
}
func testAllTestsRunOnLinux() {
XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
}
@ -348,7 +366,9 @@ extension StatementTests {
("testSwitchStatementWithOptional", testSwitchStatementWithOptional),
("testForStatementWithStaticProperty", testForStatementWithStaticProperty),
("testForStatementWithContinue", testForStatementWithContinue),
("testRepeatWhileStatement", testRepeatWhileStatement)
("testRepeatWhileStatement", testRepeatWhileStatement),
("testInitializingTypeWithLeadingUnderscore", testInitializingTypeWithLeadingUnderscore),
("testCallingFunctionWithLeadingUnderscore", testCallingFunctionWithLeadingUnderscore)
]
}
}