Syntax highlighter color updates

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>

diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
index 75c18298038047a762118f9fbe7fb562a32fc305..223d1a5bf47f9babd9fc6aa59c382e09ea29037c 100644 (file)
--- a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
+++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
@@ -10,6 +10,7 @@ class ConfTextStorage: NSTextStorage {
     struct TextColorTheme {
         let plainText: NSColor
         let sections: NSColor
+        let keyType: NSColor
         let key: NSColor
         let url: NSColor
         let urlAttribute: NSColor
@@ -54,9 +55,21 @@ class ConfTextStorage: NSTextStorage {
                 .font: boldFont
             ],
             HighlightKeytype.rawValue: [
-                .foregroundColor: theme.key,
+                .foregroundColor: theme.keyType,
                 .font: boldFont
             ],
+            HighlightPublicKey.rawValue: [
+                .foregroundColor: theme.key,
+                .font: defaultFont
+            ],
+            HighlightPrivateKey.rawValue: [
+                .foregroundColor: theme.key,
+                .font: defaultFont
+            ],
+            HighlightPresharedKey.rawValue: [
+                .foregroundColor: theme.key,
+                .font: defaultFont
+            ],
             HighlightIP.rawValue: [
                 .foregroundColor: theme.url,
                 .font: defaultFont

diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextView.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextView.swift
index eda5ee9641091259b2c7b0b88deeeda236ffd2d0..4be292f64fc255a020d725b693dc64bb4730d500 100644 (file)
--- a/WireGuard/WireGuard/UI/macOS/View/ConfTextView.swift
+++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextView.swift
@@ -39,9 +39,9 @@ class ConfTextView: NSTextView {
         let theme: ConfTextStorage.TextColorTheme
         switch effectiveAppearance.bestMatch(from: [.aqua, .darkAqua]) ?? .aqua {
         case .darkAqua:
-            theme = ConfTextStorage.TextColorTheme(plainText: NSColor(hex: "#FFFFFF"), sections: NSColor(hex: "#91D462"), key: NSColor(hex: "#FC5FA3"), url: NSColor(hex: "#53A5FB"), urlAttribute: NSColor(hex: "#75B492"), comments: NSColor(hex: "#6C7986"), number: NSColor(hex: "#9686F5"), error: NSColor(hex: "#FC6A5D"))
+            theme = ConfTextStorage.TextColorTheme(plainText: NSColor(hex: "#FFFFFF"), sections: NSColor(hex: "#91D462"), keyType: NSColor(hex: "#FC5FA3"), key: NSColor(hex: "#FD8F3F"), url: NSColor(hex: "#53A5FB"), urlAttribute: NSColor(hex: "#75B492"), comments: NSColor(hex: "#6C7986"), number: NSColor(hex: "#9686F5"), error: NSColor(hex: "#FF4C4C"))
         default:
-            theme = ConfTextStorage.TextColorTheme(plainText: NSColor(hex: "#000000"), sections: NSColor(hex: "#326D74"), key: NSColor(hex: "#9B2393"), url: NSColor(hex: "#0E0EFF"), urlAttribute: NSColor(hex: "#815F03"), comments: NSColor(hex: "#536579"), number: NSColor(hex: "#1C00CF"), error: NSColor(hex: "#C41A16"))
+            theme = ConfTextStorage.TextColorTheme(plainText: NSColor(hex: "#000000"), sections: NSColor(hex: "#326D74"), keyType: NSColor(hex: "#9B2393"), key: NSColor(hex: "#643820"), url: NSColor(hex: "#0E0EFF"), urlAttribute: NSColor(hex: "#815F03"), comments: NSColor(hex: "#536579"), number: NSColor(hex: "#1C00CF"), error: NSColor(hex: "#C41A16"))
         }
         confTextStorage.updateAttributes(for: theme)
     }