Fix bytepos2charpos()

2 files changed, 14 insertions, 1 deletions

diff --git a/rplugin/python3/deoplete/tests/test_util.py b/rplugin/python3/deoplete/tests/test_util.py
new file mode 100644
index 0000000..f9aee02
--- /dev/null
+++ b/rplugin/python3/deoplete/tests/test_util.py
@@ -0,0 +1,13 @@
+from unittest import TestCase
+from nose.tools import eq_
+from deoplete.util import (
+    bytepos2charpos, charpos2bytepos)
+
+
+class UtilTestCase(TestCase):
+
+    def test_pos(self):
+        eq_(bytepos2charpos('utf-8', 'foo bar', 3), 3)
+        eq_(bytepos2charpos('utf-8', 'あああ', 3), 1)
+        eq_(charpos2bytepos('utf-8', 'foo bar', 3), 3)
+        eq_(charpos2bytepos('utf-8', 'あああ', 3), 9)
diff --git a/rplugin/python3/deoplete/util.py b/rplugin/python3/deoplete/util.py
index b913594..486612a 100644
--- a/rplugin/python3/deoplete/util.py
+++ b/rplugin/python3/deoplete/util.py
@@ -73,7 +73,7 @@ def charpos2bytepos(encoding, input, pos):
 
 
 def bytepos2charpos(encoding, input, pos):
-    return len(str(bytes(input[: pos], encoding)))
+    return len(bytes(input, encoding)[: pos].decode(encoding))
 
 
 def get_custom(custom, source_name, key, default):