update to vi@0.7

libgokien · Jun 3, 2024 · 6fcd0a1 · 6fcd0a1
1 parent 16abf80
commit 6fcd0a1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ version = "0.1"
 path = "ribus"
 
 [workspace.dependencies.vi]
-version = "0.6"
+version = "0.7"
 path = "../vi-rs"
 
 [workspace.lints.clippy]

diff --git a/gokien/src/lib.rs b/gokien/src/lib.rs
@@ -6,7 +6,7 @@ use std::mem;
 
 use ribus::c::{self, guint};
 use tracing::{debug, error};
-use vi::telex::transform_buffer;
+use vi::transform_buffer;
 
 // account for incorrect typos
 const MAX_CHARS_IN_WORD: usize = "nghieengz".len().next_power_of_two();
@@ -122,7 +122,7 @@ impl GokienEngine {
         }
 
         let buffer = self.buffer.iter().cloned();
-        transform_buffer(buffer, &mut self.output);
+        transform_buffer(&vi::TELEX, buffer, &mut self.output);
         true
     }
 

diff --git a/gokien/src/tests.rs b/gokien/src/tests.rs
@@ -1,4 +1,6 @@
-use super::{transform_buffer, GokienEngine};
+use vi::transform_buffer;
+
+use super::GokienEngine;
 
 #[test]
 fn main() {
@@ -22,7 +24,7 @@ fn test_vi_whole_word() {
         ("wwww", "wwww")
     ];
     for (word, expected) in cases.into_iter() {
-        transform_buffer(word.chars(), &mut out);
+        transform_buffer(&vi::TELEX, word.chars(), &mut out);
         assert_eq!(*expected, out);
         out.clear();
     }

diff --git a/todo b/todo
@@ -1,5 +1,7 @@
 # Triage
 
+# rewrite vi::Word with char?
+
 ### Install and test with log
   ```bash
   ibus read-config