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

Support function argument pre-processors

Browse Source 
This change adds support for three pre-processors that can appear in
function delcarations: `#file`, `#line` and `#function`. They’re not
highlighted as pre-processors, but rather as keywords, to match the
way Xcode treats them.
This commit is contained in:
John Sundell 2019-03-09 13:12:23 +01:00
parent d74074f409
commit 59161f2724
2 changed files with 37 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

@ -48,7 +48,7 @@ private extension SwiftGrammar {
"#selector", "required", "willSet", "didSet", "#selector", "required", "willSet", "didSet",
"lazy", "subscript", "defer", "inout", "while", "lazy", "subscript", "defer", "inout", "while",
"continue", "fallthrough", "repeat", "indirect", "continue", "fallthrough", "repeat", "indirect",
"deinit", "is" "deinit", "is", "#file", "#line", "#function"
] as Set<String>).union(accessControlKeywords) ] as Set<String>).union(accessControlKeywords)
static let accessControlKeywords: Set<String> = [ static let accessControlKeywords: Set<String> = [

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

@ -656,6 +656,41 @@ final class DeclarationTests: SyntaxHighlighterTestCase {
]) ])
} }
func testFunctionDeclarationWithPreProcessors() {
let components = highlighter.highlight("""
func log(_ file: StaticString = #file, _ function: StaticString = #function) {}
""")
XCTAssertEqual(components, [
.token("func", .keyword),
.whitespace(" "),
.plainText("log("),
.token("_", .keyword),
.whitespace(" "),
.plainText("file:"),
.whitespace(" "),
.token("StaticString", .type),
.whitespace(" "),
.plainText("="),
.whitespace(" "),
.token("#file", .keyword),
.plainText(","),
.whitespace(" "),
.token("_", .keyword),
.whitespace(" "),
.plainText("function:"),
.whitespace(" "),
.token("StaticString", .type),
.whitespace(" "),
.plainText("="),
.whitespace(" "),
.token("#function", .keyword),
.plainText(")"),
.whitespace(" "),
.plainText("{}")
])
}
func testIndirectEnumDeclaration() { func testIndirectEnumDeclaration() {
let components = highlighter.highlight(""" let components = highlighter.highlight("""
indirect enum Content { indirect enum Content {
@ -725,6 +760,7 @@ extension DeclarationTests {
("testFunctionDeclarationWithInOutParameter", testFunctionDeclarationWithInOutParameter), ("testFunctionDeclarationWithInOutParameter", testFunctionDeclarationWithInOutParameter),
("testFunctionDeclarationWithNonEscapedKeywordAsName", testFunctionDeclarationWithNonEscapedKeywordAsName), ("testFunctionDeclarationWithNonEscapedKeywordAsName", testFunctionDeclarationWithNonEscapedKeywordAsName),
("testFunctionDeclarationWithEscapedKeywordAsName", testFunctionDeclarationWithEscapedKeywordAsName), ("testFunctionDeclarationWithEscapedKeywordAsName", testFunctionDeclarationWithEscapedKeywordAsName),
("testFunctionDeclarationWithPreProcessors", testFunctionDeclarationWithPreProcessors),
("testIndirectEnumDeclaration", testIndirectEnumDeclaration) ("testIndirectEnumDeclaration", testIndirectEnumDeclaration)
] ]
} }