feat: force theme update on startup

Author: humblehacker

Modules/Feature/AppFeature/HelixView.swift

@@ -22,7 +22,7 @@ public struct HelixView: View {
         WithViewStore(store, observe: { $0 }) { viewStore in
             TermView(store: store.scope(state: \.terminalState, action: HelixFeature.Action.terminal))
                 .padding(4)
-                .background(viewStore.backgroundColor?.toSwiftUI() ?? SwiftUI.Color.blue)
+                .background(viewStore.backgroundColor?.toSwiftUI() ?? SwiftUI.Color.black)
         }
     }
 }

Modules/Feature/HelixFeature/HelixFeature.swift

@@ -63,9 +63,11 @@ public struct HelixFeature: Reducer, Sendable {
 
                 let env = ["HELIX_RUNTIME": helixRoot.appendingPathComponent("runtime").path]
 
+
                 return .run { [ipcManager] send in
                     await send(.terminal(.startShell(args: shellArgs, env: env)))
                     await ipcManager.start(inputPipeURL: inputPipeURL, outputPipeURL: outputPipeURL)
+                    Task { await ipcManager.sendMessage("force_theme_update:") }
 
                     for await message in await ipcManager.serverMessages {
                         print(message)
@@ -74,10 +76,12 @@ public struct HelixFeature: Reducer, Sendable {
                         switch command {
                         case "fileChanged":
                             await send(.fileChanged(URL(fileURLWithPath: rest.first!)))
+
                         case "themeChanged":
                             // rest should contain #RGB value
                             let rgb = Color(hexColorString: rest.first!)
                             await send(.themeChanged(bgColor: rgb))
+
                         default:
                             print("unknown command \(message)")
                         }

Modules/Feature/HelixFeature/IPCManager.swift

@@ -63,14 +63,14 @@ actor IPCManager {
     func sendMessage(_ message: String) {
         guard let inputPipeURL else { return }
 
-        Task {
-            let fileHandle = try! FileHandle(forWritingTo: inputPipeURL)
-            defer { try! fileHandle.close() }
+        print("sending message \(message)")
 
-            let secData = message.data(using: .utf8)
-            if let secData = secData {
-                try! fileHandle.write(contentsOf: secData)
-            }
+        let fileHandle = try! FileHandle(forWritingTo: inputPipeURL)
+        defer { try! fileHandle.close() }
+
+        let secData = message.data(using: .utf8)
+        if let secData = secData {
+            try! fileHandle.write(contentsOf: secData)
         }
     }
 

helix/helix-term/src/application.rs

@@ -497,6 +497,9 @@ impl Application<'_> {
             "" => {
                 self.execute_typed_command(&*rest.join(" "))
             }
+            "force_theme_update" => {
+                self.editor.ipc_notify_theme_changed();
+            }
             "exit" => return false,
             _ => self.editor.set_error(format!("unknown command {}", command)),
         }

helix/helix-view/src/editor.rs

@@ -1164,6 +1164,7 @@ impl Editor {
                 let last_theme = std::mem::replace(&mut self.theme, theme);
                 // only insert on first preview: this will be the last theme the user has saved
                 self.last_theme.get_or_insert(last_theme);
+                self.ipc_notify_theme_changed();
             }
             ThemeAction::Set => {
                 self.last_theme = None;
@@ -1844,18 +1845,24 @@ impl Editor {
     pub fn ipc_notify_theme_changed(&self) {
         unsafe {
             if let Some(ipc) = IPC.clone() {
-                if let Some(bgStyle) = self.theme.try_get("ui.background") {
-                    if let Some(bgColor) = bgStyle.bg {
-                        let hexColor = Self::color_to_hex_string(bgColor);
-                        tokio::spawn(async move {
-                            let _ = ipc.send_output_event(format!("themeChanged: {}", hexColor)).await;
-                        });
-                    }
+                if let Some(hex_color) = self.get_background_color() {
+                    tokio::spawn(async move {
+                        let _ = ipc.send_output_event(format!("themeChanged: {}", hex_color)).await;
+                    });
                 }
             }
         }
     }
 
+    pub fn get_background_color(&self) -> Option<String> {
+        if let Some(bg_style) = self.theme.try_get("ui.background") {
+            if let Some(bg_color) = bg_style.bg {
+                return Some(Self::color_to_hex_string(bg_color));
+            }
+        }
+        None
+    }
+
     fn color_to_hex_string(color: Color) -> String {
         match color {
             Color::Rgb(r, g, b) => format!("#{:02X}{:02X}{:02X}", r, g, b),