JavaScript Highlighter code cleanup

This commit is contained in:
Shadowfacts 2020-04-03 09:53:12 -04:00
parent 6e4cbfdb6d
commit f27fc8eb9e
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 47 additions and 12 deletions

View File

@ -78,7 +78,24 @@ class JavaScriptHighlighter {
return attributed return attributed
} }
private func emit(token: TokenType, range: NSRange) {
let color: NSColor
switch token {
case .string:
color = .systemRed
case .number:
color = .systemBlue
case .punctuation:
color = .systemTeal
case .identifier:
return
}
attributed.addAttribute(.foregroundColor, value: color, range: range)
}
private func consumeExpression() { private func consumeExpression() {
consumeWhitespace()
guard let char = peek() else { return } guard let char = peek() else { return }
if identifierStarts.contains(char) { if identifierStarts.contains(char) {
@ -104,6 +121,13 @@ class JavaScriptHighlighter {
} }
} }
private func consumeWhitespace(newlines: Bool = false) {
let charSet = newlines ? CharacterSet.whitespacesAndNewlines : .whitespaces
while let char = peek(), charSet.contains(char) {
consume()
}
}
private func consumeIdentifier() { private func consumeIdentifier() {
let identifierStart = currentIndex! let identifierStart = currentIndex!
while let char = peek(), identifiers.contains(char) { while let char = peek(), identifiers.contains(char) {
@ -124,7 +148,7 @@ class JavaScriptHighlighter {
} }
} }
print("Number: \(text[numberStart..<currentIndex])") print("Number: \(text[numberStart..<currentIndex])")
attributed.addAttribute(.foregroundColor, value: NSColor.systemBlue, range: range(from: numberStart, to: currentIndex)) emit(token: .number, range: range(from: numberStart, to: currentIndex))
} }
private func consumeString() { private func consumeString() {
@ -137,7 +161,7 @@ class JavaScriptHighlighter {
consume() // string closing quote consume() // string closing quote
} }
print("String: \(text[stringStart..<currentIndex])") print("String: \(text[stringStart..<currentIndex])")
attributed.addAttribute(.foregroundColor, value: NSColor.systemRed, range: range(from: stringStart, to: currentIndex)) emit(token: .string, range: range(from: stringStart, to: currentIndex))
} }
private func consumeTemplateString() { private func consumeTemplateString() {
@ -148,7 +172,7 @@ class JavaScriptHighlighter {
consume() // $ consume() // $
consume() // { consume() // {
print("Template string fragment: '\(text[stringFragmentStart!..<currentIndex])'") print("Template string fragment: '\(text[stringFragmentStart!..<currentIndex])'")
attributed.addAttribute(.foregroundColor, value: NSColor.systemRed, range: range(from: stringFragmentStart!, to: currentIndex)) emit(token: .string, range: range(from: stringFragmentStart!, to: currentIndex))
consumeTemplateStringExpression() consumeTemplateStringExpression()
stringFragmentStart = currentIndex stringFragmentStart = currentIndex
if currentIndex < text.endIndex && peek() == "}" { if currentIndex < text.endIndex && peek() == "}" {
@ -158,7 +182,7 @@ class JavaScriptHighlighter {
stringFragmentStart = stringFragmentStart ?? currentIndex stringFragmentStart = stringFragmentStart ?? currentIndex
consume() // ` consume() // `
print("Template string fragment: '\(text[stringFragmentStart!..<currentIndex])'") print("Template string fragment: '\(text[stringFragmentStart!..<currentIndex])'")
attributed.addAttribute(.foregroundColor, value: NSColor.systemRed, range: range(from: stringFragmentStart!, to: currentIndex)) emit(token: .string, range: range(from: stringFragmentStart!, to: currentIndex))
stringFragmentStart = nil stringFragmentStart = nil
break break
} else { } else {
@ -167,7 +191,7 @@ class JavaScriptHighlighter {
} }
if let start = stringFragmentStart { if let start = stringFragmentStart {
print("Template string fragment: '\(text[start..<currentIndex])'") print("Template string fragment: '\(text[start..<currentIndex])'")
attributed.addAttribute(.foregroundColor, value: NSColor.systemRed, range: range(from: start, to: currentIndex)) emit(token: .string, range: range(from: start, to: currentIndex))
} }
} }
@ -187,7 +211,7 @@ class JavaScriptHighlighter {
private func consumeFunctionCallOrGrouping() { private func consumeFunctionCallOrGrouping() {
consume() // ( consume() // (
print("Opening (") print("Opening (")
attributed.addAttribute(.foregroundColor, value: NSColor.systemTeal, range: prevCharRange()) emit(token: .punctuation, range: prevCharRange())
indent += " " indent += " "
while currentIndex < text.endIndex && peek() != ")" { while currentIndex < text.endIndex && peek() != ")" {
consumeExpression() consumeExpression()
@ -196,14 +220,14 @@ class JavaScriptHighlighter {
if currentIndex < text.endIndex { if currentIndex < text.endIndex {
consume() // ) consume() // )
print("Closing )") print("Closing )")
attributed.addAttribute(.foregroundColor, value: NSColor.systemTeal, range: prevCharRange()) emit(token: .punctuation, range: prevCharRange())
} }
} }
private func consumeObject() { private func consumeObject() {
consume() // { consume() // {
print("Opening {") print("Opening {")
attributed.addAttribute(.foregroundColor, value: NSColor.systemTeal, range: prevCharRange()) emit(token: .punctuation, range: prevCharRange())
indent += " " indent += " "
object: object:
while currentIndex < text.endIndex && peek() != "}" { while currentIndex < text.endIndex && peek() != "}" {
@ -226,7 +250,7 @@ class JavaScriptHighlighter {
if currentIndex < text.endIndex { if currentIndex < text.endIndex {
consume() // } consume() // }
print("Closing }") print("Closing }")
attributed.addAttribute(.foregroundColor, value: NSColor.systemTeal, range: prevCharRange()) emit(token: .punctuation, range: prevCharRange())
} }
} }
@ -244,13 +268,13 @@ class JavaScriptHighlighter {
private func consumeDotLookup() { private func consumeDotLookup() {
consume() // . consume() // .
print("Dot lookup") print("Dot lookup")
attributed.addAttribute(.foregroundColor, value: NSColor.systemTeal, range: prevCharRange()) emit(token: .punctuation, range: prevCharRange())
} }
private func consumeArray() { private func consumeArray() {
consume() // [ consume() // [
print("Opening [") print("Opening [")
attributed.addAttribute(.foregroundColor, value: NSColor.systemTeal, range: prevCharRange()) emit(token: .punctuation, range: prevCharRange())
indent += " " indent += " "
array: array:
while currentIndex < text.endIndex && peek() != "]" { while currentIndex < text.endIndex && peek() != "]" {
@ -258,6 +282,8 @@ class JavaScriptHighlighter {
while currentIndex < text.endIndex { while currentIndex < text.endIndex {
if peek() == "," { if peek() == "," {
consume() // , consume() // ,
print("Array separator")
emit(token: .punctuation, range: prevCharRange())
break break
} else if peek() == "]" { } else if peek() == "]" {
break array break array
@ -272,8 +298,17 @@ class JavaScriptHighlighter {
if currentIndex < text.endIndex { if currentIndex < text.endIndex {
consume() // ] consume() // ]
print("Closing ]") print("Closing ]")
attributed.addAttribute(.foregroundColor, value: NSColor.systemTeal, range: prevCharRange()) emit(token: .punctuation, range: prevCharRange())
} }
} }
} }
extension JavaScriptHighlighter {
enum TokenType {
case identifier
case punctuation
case number
case string
}
}