Theme dark mode support + loading colors from xcassets file

DemoApp/EditorViewController.swift

@@ -22,7 +22,6 @@ class EditorViewController: NSViewController {
             NeonPlugin(theme: .default, language: .swift)
         )
 
-        textView.backgroundColor = .controlBackgroundColor
         textView.font = .monospacedSystemFont(ofSize: 0, weight: .regular)
 
         textView.string = """

Package.swift

@@ -23,7 +23,9 @@ let package = Package(
                 .product(name: "STTextView", package: "STTextView"),
                 "Neon",
                 .product(name: "TreeSitter", package: "tree-sitter-xcframework")
-            ]
+            ],
+            path: "Sources/NeonPlugin",
+            resources: [.process("Themes.xcassets")]
         )
     ]
 )

Sources/NeonPlugin/Coordinator.swift

@@ -37,25 +37,25 @@ public class Coordinator {
         }
 
         // set textview default font to theme default font
-        textView.font = theme.tokens[.default]?.font?.value ?? textView.font
+        textView.font = theme.defaultFont ?? textView.font
 
         highlighter = Neon.Highlighter(textInterface: STTextViewSystemInterface(textView: textView) { neonToken in
             var attributes: [NSAttributedString.Key: Any] = [:]
             if let tvFont = textView.font {
                 attributes[.font] = tvFont
             }
 
-            if let themeValue = theme.tokens[TokenName(neonToken.name)] {
-                attributes[.foregroundColor] = themeValue.color.value
+            if let themeColor = theme.color(forToken: TokenName(neonToken.name)) {
+                attributes[.foregroundColor] = themeColor
 
-                if let font = themeValue.font?.value {
-                    attributes[.font] = font
+                if let themeFont = theme.font(forToken: TokenName(neonToken.name)) {
+                    attributes[.font] = themeFont
                 }
-            } else if let themeValue = theme.tokens[.default]{
-                attributes[.foregroundColor] = themeValue.color.value
+            } else if let themeDefaultColor = theme.defaultColor {
+                attributes[.foregroundColor] = themeDefaultColor
 
-                if let font = themeValue.font?.value {
-                    attributes[.font] = font
+                if let themeFont = theme.font(forToken: TokenName(neonToken.name)) {
+                    attributes[.font] = themeFont
                 }
             }
 

Sources/NeonPlugin/Theme+Default.swift

@@ -0,0 +1,15 @@
+import Foundation
+import AppKit
+
+extension Theme {
+
+    public static let `default` = Theme(
+        colors: Colors(bundle: Bundle.module, name: "neon.plugin.default"),
+        tokensCustomFontDict: [
+            "default": NSFont.monospacedSystemFont(ofSize: 0, weight: .regular),
+            "keyword": NSFont.monospacedSystemFont(ofSize: 0, weight: .bold),
+            "constructor": NSFont.monospacedSystemFont(ofSize: 0, weight: .bold)
+
+        ]
+    )
+}

Sources/NeonPlugin/Theme.swift

@@ -0,0 +1,49 @@
+import Cocoa
+
+public struct Theme {
+
+    // MARK: - Props
+    let colors: Colors
+    let tokensCustomFontDict: [TokenName: NSFont]
+
+    // MARK: - Lifecycle
+    public init(colors: Colors, tokensCustomFontDict: [TokenName: NSFont] = [:]) {
+        self.colors = colors
+        self.tokensCustomFontDict = tokensCustomFontDict
+    }
+
+    public var defaultFont: NSFont? {
+        return tokensCustomFontDict["default"]
+    }
+
+    public var defaultColor: NSColor? {
+        return color(forToken: "default")
+    }
+
+    public func color(forToken tokenName: TokenName) -> NSColor? {
+        return colors.color(forToken: tokenName)
+    }
+
+    public func font(forToken tokenName: TokenName) -> NSFont? {
+        return tokensCustomFontDict[tokenName]
+    }
+}
+
+extension Theme {
+
+    public struct Colors {
+
+        let bundle: Bundle
+        let name: String
+
+        public init(bundle: Bundle, name: String) {
+            self.bundle = bundle
+            self.name = name
+        }
+
+        func color(forToken tokenName: TokenName) -> NSColor? {
+            let colorName = "\(name)/\(tokenName)"
+            return NSColor(named: colorName, bundle: bundle)
+        }
+    }
+}

Sources/NeonPlugin/Themes.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/NeonPlugin/Themes.xcassets/neon.plugin.default/Contents.json

@@ -0,0 +1,9 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "provides-namespace" : true
+  }
+}

Sources/NeonPlugin/Themes.xcassets/neon.plugin.default/boolean.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "147",
+          "green" : "35",
+          "red" : "155"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "108",
+          "green" : "220",
+          "red" : "100"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/NeonPlugin/Themes.xcassets/neon.plugin.default/comment.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.500",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.550",
+          "blue" : "255",
+          "green" : "255",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/NeonPlugin/Themes.xcassets/neon.plugin.default/constructor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "147",
+          "green" : "35",
+          "red" : "155"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "108",
+          "green" : "220",
+          "red" : "100"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}