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

Don’t highlight keyword names used in optional binding (#96) 

This patch makes Splash no longer highlight variables with the same
name as a keyword when used in optional binding, for example:

```
if let override = makeOverride() { ... }
```
This commit is contained in:
John Sundell 2020-01-29 11:04:14 +01:00 committed by GitHub
parent bb8655e6d2
commit 812811ff69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,32 +322,39 @@ private extension SwiftGrammar {
}
}
if let previousToken = segment.tokens.previous,
!declarationKeywords.contains(segment.tokens.current) {
// Highlight the '(set)' part of setter access modifiers
switch segment.tokens.current {
case "(":
return accessControlKeywords.contains(previousToken)
case "set":
if previousToken == "(" {
return true
}
case ")":
return previousToken == "set"
default:
break
if let previousToken = segment.tokens.previous {
// Don't highlight variables with the same name as a keyword
// when used in optional binding, such as if let, guard let:
guard !previousToken.isAny(of: "let", "var") else {
return false
}
// Don't highlight most keywords when used as a parameter label
if !segment.tokens.current.isAny(of: "_", "self", "let", "var", "true", "false", "inout", "nil") {
guard !previousToken.isAny(of: "(", ",", ">(") else {
if !declarationKeywords.contains(segment.tokens.current) {
// Highlight the '(set)' part of setter access modifiers
switch segment.tokens.current {
case "(":
return accessControlKeywords.contains(previousToken)
case "set":
if previousToken == "(" {
return true
}
case ")":
return previousToken == "set"
default:
break
}
// Don't highlight most keywords when used as a parameter label
if !segment.tokens.current.isAny(of: "_", "self", "let", "var", "true", "false", "inout", "nil") {
guard !previousToken.isAny(of: "(", ",", ">(") else {
return false
}
}
guard !segment.tokens.previous.isAny(of: "func", "`") else {
return false
}
}
guard !segment.tokens.previous.isAny(of: "func", "`") else {
return false
}
}
return keywords.contains(segment.tokens.current)

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

@ -62,6 +62,24 @@ final class StatementTests: SyntaxHighlighterTestCase {
])
}
func testIfLetStatementWithKeywordSymbolName() {
let components = highlighter.highlight("if let override = optional {}")
XCTAssertEqual(components, [
.token("if", .keyword),
.whitespace(" "),
.token("let", .keyword),
.whitespace(" "),
.plainText("override"),
.whitespace(" "),
.plainText("="),
.whitespace(" "),
.plainText("optional"),
.whitespace(" "),
.plainText("{}")
])
}
func testSwitchStatement() {
let components = highlighter.highlight("""
switch variable {
@ -395,6 +413,7 @@ extension StatementTests {
("testImportStatement", testImportStatement),
("testImportStatementWithSubmodule", testImportStatementWithSubmodule),
("testChainedIfElseStatements", testChainedIfElseStatements),
("testIfLetStatementWithKeywordSymbolName", testIfLetStatementWithKeywordSymbolName),
("testSwitchStatement", testSwitchStatement),
("testSwitchStatementWithSingleAssociatedValue", testSwitchStatementWithSingleAssociatedValue),
("testSwitchStatementWithMultipleAssociatedValues", testSwitchStatementWithMultipleAssociatedValues),