Fix offset calculation for multi-byte characters

junegunn · May 8, 2015 · bc7d393 · bc7d393
1 parent 7c2349c
commit bc7d393
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/autoload/after_object.vim b/autoload/after_object.vim
@@ -43,7 +43,7 @@ function! s:after(str, cnt, vis, bw)
       let len = 0
       let idx = 0
       for part in parts[0 : (a:bw ? -2 : -3)]
-        let len += len(part)
+        let len += strchars(part)
         if len > col - 1
           break
         endif
@@ -53,10 +53,10 @@ function! s:after(str, cnt, vis, bw)
       if a:bw
         let idx = max([idx - 2, 0])
       endif
-      let col = len(join(parts[0 : idx], '')) + (i > 1 && a:cnt > 1)
+      let col = strchars(join(parts[0 : idx], '')) + (i > 1 && a:cnt > 1)
     endfor
 
-    let rest = line[col : -1]
+    let rest = substitute(line, '^.\{'.col.'}', '', '')
     if empty(rest)
       throw 'exit'
     else

diff --git a/test/after_object.vader b/test/after_object.vader
@@ -221,3 +221,16 @@ Do:
 
 Expect:
   abc =
+
+Given (Multi-byte characters):
+  ___가나다:   foobar
+  ___가나다:   ___라마바:   foobar
+
+Do:
+  ca:hello\<esc>
+  jva:a:chello\<esc>
+
+Expect:
+  ___가나다:   hello
+  ___가나다:   ___라마바:   hello
+