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

Merge pull request #38 from JohnSundell/bool-as-argument

Browse Source 
Correctly highlight Bools passed as unnamed function arguments
This commit is contained in:
John Sundell 2019-03-08 18:38:40 +01:00 committed by GitHub
commit a7df9b171f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,7 @@ private extension SwiftGrammar {
if let previousToken = segment.tokens.previous { if let previousToken = segment.tokens.previous {
// Don't highlight most keywords when used as a parameter label // Don't highlight most keywords when used as a parameter label
if !segment.tokens.current.isAny(of: "_", "self", "let", "var") { if !segment.tokens.current.isAny(of: "_", "self", "let", "var", "true", "false") {
guard !previousToken.isAny(of: "(", ",") else { guard !previousToken.isAny(of: "(", ",") else {
return false return false
} }

14
Tests/SplashTests/Tests/FunctionCallTests.swift
View File

@ -119,6 +119,17 @@ final class FunctionCallTests: SyntaxHighlighterTestCase {
]) ])
} }
func testPassingBoolToUnnamedArgument() {
let components = highlighter.highlight("setCachingEnabled(true)")
XCTAssertEqual(components, [
.token("setCachingEnabled", .call),
.plainText("("),
.token("true", .keyword),
.plainText(")")
])
}
func testAllTestsRunOnLinux() { func testAllTestsRunOnLinux() {
XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests)) XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
} }
@ -134,7 +145,8 @@ extension FunctionCallTests {
("testAccessingPropertyAfterFunctionCallWithoutArguments", testAccessingPropertyAfterFunctionCallWithoutArguments), ("testAccessingPropertyAfterFunctionCallWithoutArguments", testAccessingPropertyAfterFunctionCallWithoutArguments),
("testAccessingPropertyAfterFunctionCallWithArguments", testAccessingPropertyAfterFunctionCallWithArguments), ("testAccessingPropertyAfterFunctionCallWithArguments", testAccessingPropertyAfterFunctionCallWithArguments),
("testCallingStaticMethodOnGenericType", testCallingStaticMethodOnGenericType), ("testCallingStaticMethodOnGenericType", testCallingStaticMethodOnGenericType),
("testPassingTypeToFunction", testPassingTypeToFunction) ("testPassingTypeToFunction", testPassingTypeToFunction),
("testPassingBoolToUnnamedArgument", testPassingBoolToUnnamedArgument)
] ]
} }
} }