Two separate commands for ImeCommit and ImePreedit

Author: fredizzimo

src/bridge/ui_commands.rs

@@ -23,10 +23,12 @@ use crate::{
 #[derive(Clone, Debug, AsRefStr)]
 pub enum SerialCommand {
     Keyboard(String),
-    KeyboardAsIme {
-        formatted: Option<String>,
+    KeyboardImeCommit {
+        formatted: String,
+        raw: String,
+    },
+    KeyboardImePreedit {
         raw: String,
-        commit: bool,
         cursor_offset: Option<(usize, usize)>,
     },
     MouseButton {
@@ -65,45 +67,38 @@ impl SerialCommand {
                     .map(|_| ())
                     .context("Input failed")
             }
-            SerialCommand::KeyboardAsIme {
-                formatted,
-                commit,
-                raw,
-                cursor_offset,
-            } => {
-                if commit {
-                    // Notified ime commit event, the text is guaranteed not to be None.
-                    let text = formatted.unwrap();
-                    trace!("IME Input Sent: {}", &text);
-                    nvim.call(
-                        "nvim_exec_lua_lua",
-                        call_args![
-                            "neovide.commit_handler(...)",
-                            vec![Value::from(raw), Value::from(text)],
-                        ],
-                    )
-                    .await
-                    .map(|_| ())
-                    .context("IME Commit failed")
-                } else {
-                    trace!("IME Input Preedit");
+            SerialCommand::KeyboardImeCommit { formatted, raw } => {
+                // Notified ime commit event, the text is guaranteed not to be None.
+                trace!("IME Input Sent: {}", &formatted);
+                nvim.call(
+                    "nvim_exec_lua_lua",
+                    call_args![
+                        "neovide.commit_handler(...)",
+                        vec![Value::from(raw), Value::from(formatted)],
+                    ],
+                )
+                .await
+                .map(|_| ())
+                .context("IME Commit failed")
+            }
+            SerialCommand::KeyboardImePreedit { raw, cursor_offset } => {
+                trace!("IME Input Preedit");
 
-                    let (start_col, end_col) = cursor_offset
-                        .map_or((Value::Nil, Value::Nil), |(start_col, end_col)| {
-                            (Value::from(start_col), Value::from(end_col))
-                        });
+                let (start_col, end_col) = cursor_offset
+                    .map_or((Value::Nil, Value::Nil), |(start_col, end_col)| {
+                        (Value::from(start_col), Value::from(end_col))
+                    });
 
-                    nvim.call(
-                        "nvim_exec_lua_fast",
-                        call_args![
-                            "neovide.preedit_handler(...)",
-                            vec![Value::from(raw), start_col, end_col],
-                        ],
-                    )
-                    .await
-                    .map(|_| ())
-                    .context("IME Preedit failed")
-                }
+                nvim.call(
+                    "nvim_exec_lua_fast",
+                    call_args![
+                        "neovide.preedit_handler(...)",
+                        vec![Value::from(raw), start_col, end_col],
+                    ],
+                )
+                .await
+                .map(|_| ())
+                .context("IME Preedit failed")
             }
             SerialCommand::MouseButton {
                 button,

src/window/keyboard_manager.rs

@@ -59,19 +59,15 @@ impl KeyboardManager {
             }
             WindowEvent::Ime(Ime::Commit(text)) => {
                 log::trace!("Ime commit {text}");
-                send_ui(SerialCommand::KeyboardAsIme {
-                    formatted: Some(self.format_key_text(text, false)),
+                send_ui(SerialCommand::KeyboardImeCommit {
+                    formatted: self.format_key_text(text, false),
                     raw: text.to_owned(),
-                    commit: true,
-                    cursor_offset: None,
                 });
             }
             WindowEvent::Ime(Ime::Preedit(text, cursor_offset)) => {
                 self.ime_preedit = (text.to_string(), *cursor_offset);
-                send_ui(SerialCommand::KeyboardAsIme {
-                    formatted: None,
+                send_ui(SerialCommand::KeyboardImePreedit {
                     raw: text.to_owned(),
-                    commit: false,
                     cursor_offset: *cursor_offset,
                 });
             }