Skip to content

Commit dc837b5

Browse files
committed
Merge branch 'feature/fix-syntax-highlighting-for-objc' into develop
2 parents f2b244d + 477da04 commit dc837b5

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

Core/Sources/SuggestionWidget/SyntaxHighlighting.swift

+12-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,23 @@ func highlighted(code: String, language: String) -> [NSAttributedString] {
3232
)
3333
return convertToCodeLines(formatted)
3434
default:
35+
var language = language
36+
if language == "objective-c" {
37+
language = "objectivec"
38+
}
39+
func unhighlightedCode() -> [NSAttributedString] {
40+
return convertToCodeLines(NSAttributedString(string: code, attributes: [.foregroundColor: NSColor.white]))
41+
}
3542
guard let highlighter = Highlightr() else {
36-
return convertToCodeLines(NSAttributedString(string: code))
43+
return unhighlightedCode()
3744
}
3845
highlighter.setTheme(to: "atom-one-dark")
3946
highlighter.theme.setCodeFont(.monospacedSystemFont(ofSize: 13, weight: .regular))
4047
guard let formatted = highlighter.highlight(code, as: language) else {
41-
return convertToCodeLines(NSAttributedString(string: code))
48+
return unhighlightedCode()
49+
}
50+
if formatted.string == "undefined" {
51+
return unhighlightedCode()
4252
}
4353
return convertToCodeLines(formatted)
4454
}

0 commit comments

Comments
 (0)