Try prevent hanja panic (#402)

* Add hanja empty test * Try remove empty entries * Fix test
Riey · Mar 21, 2021 · 7149615 · 7149615
1 parent 80952d8
commit 7149615
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/engine/core/Cargo.toml b/src/engine/core/Cargo.toml
@@ -26,3 +26,6 @@ maplit = "1.0.2"
 [target.'cfg(unix)'.dependencies]
 xdg = "2.2.0"
 kime-run-dir = { path = "../../tools/run_dir" }
+
+[dev-dependencies]
+pretty_assertions = "0.7.1"
diff --git a/src/engine/core/tests/hanja.rs b/src/engine/core/tests/hanja.rs
@@ -10,13 +10,22 @@ fn ra() {
         (Key::normal(K), "라", ""),
         (
             Key::normal(HangulHanja),
-            "/囉(exclamatory final particle, nag)摞瘰砢儸臝蓏倮覶鑼騾驘拏",
+            "/倮(bare, naked, uncovered)儸囉摞瘰砢臝蓏覶鑼騾驘拏",
             "",
         ),
-        (Key::normal(Enter), "", "囉"),
+        (Key::normal(Enter), "", "倮"),
     ])
 }
 
+#[test]
+fn empty() {
+    test_input(&[(Key::normal(HangulHanja), "", "")]);
+    test_input(&[
+        (Key::normal(R), "ㄱ", ""),
+        (Key::normal(HangulHanja), "ㄱ", ""),
+    ]);
+}
+
 // issue #381
 #[test]
 fn ra_arrow() {
@@ -25,14 +34,14 @@ fn ra_arrow() {
         (Key::normal(K), "라", ""),
         (
             Key::normal(HangulHanja),
-            "/囉(exclamatory final particle, nag)摞瘰砢儸臝蓏倮覶鑼騾驘拏",
+            "/倮(bare, naked, uncovered)儸囉摞瘰砢臝蓏覶鑼騾驘拏",
             "",
         ),
         (
             Key::normal(Right),
-            "囉/摞(to pile up)瘰砢儸臝蓏倮覶鑼騾驘拏",
+            "倮/儸(bandit, daredevil)囉摞瘰砢臝蓏覶鑼騾驘拏",
             "",
         ),
-        (Key::normal(Enter), "", "摞"),
+        (Key::normal(Enter), "", "儸"),
     ])
 }
diff --git a/src/engine/core/tests/shared.rs b/src/engine/core/tests/shared.rs
@@ -1,4 +1,5 @@
 use kime_engine_core::{Config, InputCategory, InputEngine, InputResult, Key, RawConfig};
+use pretty_assertions::assert_eq;
 
 #[track_caller]
 pub fn test_input_impl(config: RawConfig, category: InputCategory, keys: &[(Key, &str, &str)]) {

diff --git a/src/engine/dict/build.rs b/src/engine/dict/build.rs
@@ -176,12 +176,13 @@ fn main() {
     .unwrap();
 
     for (k, mut values) in load_hanja_dict() {
-        write!(out, "('{}', &[", k).unwrap();
+        values.retain(|e| e.hanja != '\0');
         values.sort_unstable_by_key(|x| x.ty);
+        if values.is_empty() {
+            continue;
+        }
+        write!(out, "('{}', &[", k).unwrap();
         for value in values {
-            if value.hanja == '\0' {
-                continue;
-            }
             write!(out, "('{}', \"{}\"),", value.hanja, value.definition).unwrap();
         }
         writeln!(out, "]),").unwrap();

diff --git a/src/engine/dict/src/lib.rs b/src/engine/dict/src/lib.rs
@@ -13,6 +13,13 @@ mod tests {
         assert_eq!(crate::lookup('가').unwrap()[0].0, '家');
     }
 
+    #[test]
+    fn hanja_no_empty() {
+        for (k, v) in crate::dict::HANJA_ENTRIES {
+            assert!(!v.is_empty(), "With: ({}, {:?})", k, v);
+        }
+    }
+
     #[test]
     fn math_symbols() {
         use crate::lookup_math_symbol;