macOS: Better highlighter default value and move c implementation

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index c63c721d7d46a56853679a3b974b5b8a29f3ac95..943f5a906f06a14fe45d831410150d843118b093 100644 (file)
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -391,6 +391,8 @@
                6F4DD16921DA556600690EAE /* View */ = {
                        isa = PBXGroup;
                        children = (
+                               5F52D0C021E378C000283CEA /* highlighter.h */,
+                               5F52D0C121E378C000283CEA /* highlighter.c */,
                                6F4DD16A21DA558800690EAE /* TunnelListRow.swift */,
                                6F613D9A21DE33B8004B217A /* KeyValueRow.swift */,
                                5F52D0BA21E3781B00283CEA /* ConfTextView.swift */,
@@ -529,8 +531,6 @@
                                6FB1BD6721D2607E00A991BF /* WireGuard.entitlements */,
                                6F4DD16721DA552B00690EAE /* NSTableView+Reuse.swift */,
                                5F52D0BE21E3788900283CEA /* NSColor+Hex.swift */,
-                               5F52D0C021E378C000283CEA /* highlighter.h */,
-                               5F52D0C121E378C000283CEA /* highlighter.c */,
                                6FFACD1E21E4D89600E9A2A5 /* ParseError+WireGuardAppError.swift */,
                        );
                        path = macOS;

diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
index fb8a382efde01f3b8c7cb149cc4fb455f451f574..688913c2d8fd4a1b9d37f4a0b06cd38a67b39d15 100644 (file)
--- a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
+++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
@@ -101,7 +101,7 @@ class ConfTextStorage: NSTextStorage {
 
             let range = NSRange(location: span.start, length: span.len)
             backingStore.setAttributes(nonColorAttributes(for: span.type), range: range)
-            let color = textColorTheme.colorMap[span.type.rawValue] ?? textColorTheme.defaultColor
+            let color = textColorTheme.colorMap[span.type.rawValue, default: textColorTheme.defaultColor]
             backingStore.addAttribute(.foregroundColor, value: color, range: range)
 
             if span.type == HighlightError {

diff --git a/WireGuard/WireGuard/UI/macOS/highlighter.c b/WireGuard/WireGuard/UI/macOS/View/highlighter.c
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/highlighter.c
rename to WireGuard/WireGuard/UI/macOS/View/highlighter.c

diff --git a/WireGuard/WireGuard/UI/macOS/highlighter.h b/WireGuard/WireGuard/UI/macOS/View/highlighter.h
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/highlighter.h
rename to WireGuard/WireGuard/UI/macOS/View/highlighter.h