Fix Linux desktop test compilation

Author: golbin

apps/desktop/src-tauri/src/lib.rs

@@ -12,14 +12,16 @@ mod windows;
 
 use std::path::{Path, PathBuf};
 use std::{env, ffi::OsStr};
-use tauri::{AppHandle, Emitter, Manager, RunEvent};
+#[cfg(target_os = "macos")]
+use tauri::RunEvent;
+use tauri::{AppHandle, Emitter, Manager};
 
 use commands::{
     cancel_app_quit, check_external_modification, close_document, create_document,
     create_editor_window, desktop_platform, destroy_current_window, export_pdf,
     export_pdf_from_hwp_bytes, mark_document_dirty, mutate_document, open_document,
-    open_document_with_bytes, print_webview, query_document, render_page_svg,
-    reveal_in_folder, save_document, save_document_as, save_hwp_bytes, take_pending_open_paths,
+    open_document_with_bytes, print_webview, query_document, render_page_svg, reveal_in_folder,
+    save_document, save_document_as, save_hwp_bytes, take_pending_open_paths,
 };
 use state::AppState;
 use updates::{get_update_state, restart_to_apply_update, start_update_install};
@@ -84,9 +86,12 @@ pub fn run() {
         .build(tauri::generate_context!())
         .expect("failed to build HOP desktop app");
 
-    app.run(|app, event| {
+    app.run(|_app, _event| {
         #[cfg(target_os = "macos")]
         {
+            let app = _app;
+            let event = _event;
+
             if let RunEvent::Opened { urls } = &event {
                 let paths = urls
                     .clone()

apps/desktop/src-tauri/src/linux_runtime.rs

@@ -45,10 +45,11 @@ fn requested_gtk_im_module() -> Option<String> {
         .ok()
         .and_then(|value| normalize_im_module(value.trim()))
         .or_else(|| {
-            env::var("XMODIFIERS")
-                .ok()
-                .and_then(|value| value.split("@im=").nth(1))
-                .and_then(normalize_im_module)
+            env::var("XMODIFIERS").ok().and_then(|value| {
+                value
+                    .split_once("@im=")
+                    .and_then(|(_, module)| normalize_im_module(module))
+            })
         })
 }
 
@@ -110,13 +111,17 @@ mod tests {
 
     struct EnvRestore {
         gtk_im_module_file: Option<std::ffi::OsString>,
+        gtk_im_module: Option<std::ffi::OsString>,
+        xmodifiers: Option<std::ffi::OsString>,
         appdir: Option<std::ffi::OsString>,
     }
 
     impl EnvRestore {
         fn capture() -> Self {
             Self {
                 gtk_im_module_file: env::var_os("GTK_IM_MODULE_FILE"),
+                gtk_im_module: env::var_os("GTK_IM_MODULE"),
+                xmodifiers: env::var_os("XMODIFIERS"),
                 appdir: env::var_os("APPDIR"),
             }
         }
@@ -129,6 +134,14 @@ mod tests {
                     Some(value) => env::set_var("GTK_IM_MODULE_FILE", value),
                     None => env::remove_var("GTK_IM_MODULE_FILE"),
                 }
+                match &self.gtk_im_module {
+                    Some(value) => env::set_var("GTK_IM_MODULE", value),
+                    None => env::remove_var("GTK_IM_MODULE"),
+                }
+                match &self.xmodifiers {
+                    Some(value) => env::set_var("XMODIFIERS", value),
+                    None => env::remove_var("XMODIFIERS"),
+                }
                 match &self.appdir {
                     Some(value) => env::set_var("APPDIR", value),
                     None => env::remove_var("APPDIR"),
@@ -170,9 +183,7 @@ mod tests {
         let _lock = ENV_LOCK.lock().unwrap();
         let _restore = EnvRestore::capture();
         let dir = tempfile::tempdir().unwrap();
-        let cache_path = dir
-            .path()
-            .join("usr/lib/gtk-3.0/3.0.0/immodules.cache");
+        let cache_path = dir.path().join("usr/lib/gtk-3.0/3.0.0/immodules.cache");
         fs::create_dir_all(cache_path.parent().unwrap()).unwrap();
         fs::write(&cache_path, "\"xim\"\n").unwrap();
 
@@ -192,6 +203,19 @@ mod tests {
         assert_eq!(normalize_im_module("   "), None);
     }
 
+    #[test]
+    fn requested_im_module_falls_back_to_xmodifiers() {
+        let _lock = ENV_LOCK.lock().unwrap();
+        let _restore = EnvRestore::capture();
+
+        unsafe {
+            env::remove_var("GTK_IM_MODULE");
+            env::set_var("XMODIFIERS", "@im=fcitx5");
+        }
+
+        assert_eq!(requested_gtk_im_module(), Some("fcitx".to_string()));
+    }
+
     #[test]
     fn active_cache_supports_requested_module() {
         let _lock = ENV_LOCK.lock().unwrap();