Fix bugs on color schema (import, file name with space, background color).

Author: sbarex

Application/HighlightWrapper.swift

@@ -385,6 +385,7 @@ class HighlightWrapper {
                 continue
             }
             try theme.save()
+            NotificationCenter.default.post(name: .ThemeNeedRefresh, object: theme)
         }
     }
 

Application/SCSHWrapper.swift

@@ -90,10 +90,12 @@ public class SCSHWrapper: NSObject {
         }
 
         NotificationCenter.default.addObserver(self, selector: #selector(afterThemeDeleted(_:)), name: .CustomThemeRemoved, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(afterThemeChanged(_:)), name: .ThemeNeedRefresh, object: nil)
     }
 
     deinit {
         NotificationCenter.default.removeObserver(self, name: .CustomThemeRemoved, object: nil)
+        NotificationCenter.default.removeObserver(self, name: .ThemeNeedRefresh, object: nil)
     }
 
     fileprivate (set) var isSaving = false
@@ -218,6 +220,30 @@ public class SCSHWrapper: NSObject {
         })
     }
 
+    @objc internal func afterThemeChanged(_ notification: Notification) {
+        guard let theme = notification.object as? SCSHTheme else { return }
+        SCSHWrapper.service?.updateSettingsAfterThemeBGChanged(name: theme.name, background: theme.backgroundColor) { changed in
+            
+        }
+        
+        let name = theme.nameForSettings
+        if self.settings?.lightThemeName == name {
+            self.settings?.lightBackgroundColor = theme.backgroundColor
+        }
+        if self.settings?.darkThemeName == name {
+            self.settings?.darkBackgroundColor = theme.backgroundColor
+        }
+        
+        self.settings?.utiSettings.forEach({
+            if $0.value.lightThemeName == name {
+                $0.value.lightBackgroundColor = theme.backgroundColor
+            }
+            if $0.value.darkThemeName == name {
+                $0.value.darkBackgroundColor = theme.backgroundColor
+            }
+        })
+    }
+    
     func applicationShouldTerminate(notifyTerminate: Bool = true) -> NSApplication.TerminateReply {
         guard !isSaving else {
             return .terminateLater

Application/SettingsView.swift

@@ -191,10 +191,12 @@ class SettingsView: NSView, SettingsSplitViewElement {
             let themeName = theme.nameForSettings
             if settings.lightThemeName == theme.nameForSettings {
                 settings.lightThemeName = themeName
+                settings.lightBackgroundColor = theme.backgroundColor
                 initTheme(name: settings.lightThemeName, label: themeLightLabel, button: themeLightButton)
                 self.updateAppearanceWarning()
             } else if settings.darkThemeName == theme.nameForSettings {
                 settings.darkThemeName = themeName
+                settings.darkBackgroundColor = theme.backgroundColor
                 initTheme(name: settings.darkThemeName, label: themeDarkLabel, button: themeDarkButton)
                 self.updateAppearanceWarning()
             }

Application/resources/colorize.sh

@@ -133,18 +133,12 @@ debug "Reader: ${reader}"
 debug "Highlight: $cmd"
 
 go4it () {
-    if [ "x${themeHL}" != "x" ]; then
-        theme="--style=${themeHL}"
-    else
-        theme=""
-    fi
-    
     # Split extraFlagsHL to an array of arguments using '•' as separator.
     #
     # Do not use zsh {= expansion because it split the string on all space ignoring quotes and causing error.
     cmdExtra=("${(@s/•/)extraFlagsHL}")
 
-    export cmdOptsHL=(${plugin} --syntax=${lang} --quiet --include-style ${=theme} --encoding=${textEncoding} ${cmdExtra} --validate-input)
+    export cmdOptsHL=(${plugin} --syntax=${lang} --quiet --include-style --encoding=${textEncoding} ${cmdExtra} --validate-input)
 
     if [ "x${useLSP}" != "x" ]; then
         # LSP require full path.

SyntaxHighlightRenderXPC/SCSHBaseXPCService.swift

@@ -231,11 +231,17 @@ class SCSHBaseXPCService: NSObject {
             hlArguments.arguments.append("--data-dir=\(dataDir)")
         }
 
-        if hlArguments.theme.hasPrefix("!") {
-            // Custom theme.
-            hlArguments.theme.remove(at: hlArguments.theme.startIndex)
-            if let theme_url = self.getCustomThemesUrl(createIfMissing: false)?.appendingPathComponent(hlArguments.theme).appendingPathExtension("theme") {
-                hlArguments.arguments.append("--config-file=\(theme_url.path)")
+        if custom_settings.themeLua.isEmpty {
+            if hlArguments.theme.hasPrefix("!") {
+                // Custom theme.
+                hlArguments.theme.remove(at: hlArguments.theme.startIndex)
+                if let theme_url = self.getCustomThemesUrl(createIfMissing: false)?.appendingPathComponent(hlArguments.theme).appendingPathExtension("theme") {
+                    hlArguments.arguments.append("--style=\(theme_url.path)")
+                }
+            } else if let dataDir = self.dataDir {
+                hlArguments.arguments.append("--style=\(dataDir)/themes/\(hlArguments.theme).theme")
+            } else {
+                hlArguments.arguments.append("--style=\(hlArguments.theme)")
             }
         }
 
@@ -374,21 +380,17 @@ class SCSHBaseXPCService: NSObject {
             temporaryThemeFile = URL(fileURLWithPath: directory).appendingPathComponent(NSUUID().uuidString).appendingPathExtension("theme")
             do {
                 try inline_theme.write(to: temporaryThemeFile!, atomically: true, encoding: .utf8)
-                colorize.arguments.append("--config-file=\(temporaryThemeFile!.path)")
+                colorize.arguments.append("--style=\(temporaryThemeFile!.path)")
             } catch {
                 temporaryThemeFile = nil
             }
         }
 
-        
         colorize.env.merge([
             // Highlight path
             "pathHL": colorize.highlight,
             "pathDos2unix": self.bundle.path(forResource: "dos2unix", ofType: nil) ?? "dos2unix",
 
-            // Theme to use.
-            "themeHL": colorize.theme,
-            
             "extraFlagsHL": colorize.arguments.joined(separator: "•"),
         ]) { (_, new) in new }
 

XPCService/SCSHTheme.swift

@@ -1236,6 +1236,7 @@ public class SCSHTheme: NSObject, Sequence {
         do {
             try s.write(to: url, atomically: true, encoding: .utf8)
             name = url.deletingPathExtension().lastPathComponent
+            self.path = url.path
             isDirty = false
         } catch {
             throw error

XPCService/SCSHXPCService.swift

@@ -359,6 +359,42 @@ class SCSHXPCService: SCSHBaseXPCService, SCSHXPCServiceProtocol {
         reply(u)
     }
 
+    /// Delete a custom theme.
+    /// Any references of deleted theme in the settings are replaced with a default theme.
+    /// - parameters:
+    ///   - name: Name of the theme. Is equal to the file name.
+    ///   - reply:
+    ///   - changed: True if the settings are changed.
+    func updateSettingsAfterThemeBGChanged(name: String, background: String, withReply reply: @escaping (_ changed: Bool) -> Void) {
+        // Search if any settings use the deleted theme.
+        let name = "\(name)"
+        var changed = false
+        if settings.lightThemeName == name {
+            settings.lightBackgroundColor = background
+            changed = true
+        }
+        if settings.darkThemeName == name {
+            settings.darkBackgroundColor = background
+            changed = true
+        }
+        for (_, settings) in self.settings.utiSettings {
+            if settings.lightThemeName == name {
+                settings.lightBackgroundColor = background
+                changed = true
+            }
+            if settings.darkThemeName == name {
+                settings.darkBackgroundColor = background
+                changed = true
+            }
+        }
+        if changed {
+            // Save the changed settings.
+            settings.synchronize(domain: type(of: self).XPCDomain, CSSFolder: type(of: self).getCustomStylesUrl(createIfMissing: true))
+        }
+        
+        reply(changed)
+    }
+    
     /// Delete a custom theme.
     /// Any references of deleted theme in the settings are replaced with a default theme.
     /// - parameters:

XPCService/SCSHXPCServiceProtocol.swift

@@ -91,7 +91,7 @@ import Foundation
     ///   - reply:
     ///   - changed: True if the settings are changed.
     func updateSettingsAfterThemeDeleted(name: String, withReply reply: @escaping (_ changed: Bool) -> Void)
-    
+    func updateSettingsAfterThemeBGChanged(name: String, background: String, withReply reply: @escaping (_ changed: Bool) -> Void)
     /// Return the url of the application support folder that contains themes and custom css styles.
     func getApplicationSupport(reply: @escaping (URL?)->Void)
 }