Revert "Ensure cursor position is counted by UTF16 (#657)"

This reverts commit a8ad731.
neoclide · Apr 6, 2019 · a0f8507 · Avi-D-coder · Apr 6, 2019 · chemzqm
1 parent aecaefd
commit a0f8507
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/autoload/coc/util.vim b/autoload/coc/util.vim
@@ -98,16 +98,11 @@ function! coc#util#yarn_cmd()
   return ''
 endfunction
 
-function! s:count_utf16_code_units(str) abort
-    let l:rs = split(a:str, '\zs')
-    let l:len = len(l:rs)
-    return l:len + len(filter(l:rs, 'char2nr(v:val)>=0x10000'))
-endfunction
-
 " get cursor position
 function! coc#util#cursor()
-  let pos = s:count_utf16_code_units(getline('.')[:col('.')-1])
-  return [line('.') - 1, pos - 1]
+  let pos = getcurpos()
+  let content = pos[2] == 1 ? '' : getline('.')[0: pos[2] - 2]
+  return [pos[1] - 1, strchars(content)]
 endfunction
 
 function! coc#util#close_win(id)