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

Support ‘is’ keyword

Browse Source 
This change makes Splash support the `is` keyword, for example in type
pattern matching in `switch` statements.
This commit is contained in:
John Sundell 2019-03-08 22:04:10 +01:00
parent 45ca85e299
commit d72e816cd8
2 changed files with 35 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",
"lazy", "subscript", "defer", "inout", "while",
"continue", "fallthrough", "repeat", "indirect",
"deinit"
"deinit", "is"
] as Set<String>).union(accessControlKeywords)
static let accessControlKeywords: Set<String> = [

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

@ -169,6 +169,39 @@ final class StatementTests: SyntaxHighlighterTestCase {
])
}
func testSwitchStatementWithTypePatternMatching() {
let components = highlighter.highlight("""
switch variable {
case is MyType: break
default: break
}
""")
XCTAssertEqual(components, [
.token("switch", .keyword),
.whitespace(" "),
.plainText("variable"),
.whitespace(" "),
.plainText("{"),
.whitespace("\n"),
.token("case", .keyword),
.whitespace(" "),
.token("is", .keyword),
.whitespace(" "),
.token("MyType", .type),
.plainText(":"),
.whitespace(" "),
.token("break", .keyword),
.whitespace("\n"),
.token("default", .keyword),
.plainText(":"),
.whitespace(" "),
.token("break", .keyword),
.whitespace("\n"),
.plainText("}")
])
}
func testForStatementWithStaticProperty() {
let components = highlighter.highlight("for value in Enum.allCases { }")
@ -272,6 +305,7 @@ extension StatementTests {
("testSwitchStatement", testSwitchStatement),
("testSwitchStatementWithAssociatedValues", testSwitchStatementWithAssociatedValues),
("testSwitchStatementWithFallthrough", testSwitchStatementWithFallthrough),
("testSwitchStatementWithTypePatternMatching", testSwitchStatementWithTypePatternMatching),
("testForStatementWithStaticProperty", testForStatementWithStaticProperty),
("testForStatementWithContinue", testForStatementWithContinue),
("testRepeatWhileStatement", testRepeatWhileStatement)