y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #144 from t7ko/bugfix/fold-shortening-bug-on-utf8

Browse Source 
Fix bug with folds shortening on multibyte characters.
This commit is contained in:
EinfachToll 2015-07-08 11:54:25 +02:00
commit 854219f42e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ftplugin/vimwiki.vim
View File

@ -177,15 +177,20 @@ endfunction "}}}
" for long enough "text", the string's length is within s:tolerance of "len" " for long enough "text", the string's length is within s:tolerance of "len"
" (so that -s:tolerance <= spare <= s:tolerance, "string" ends with s:ellipsis) " (so that -s:tolerance <= spare <= s:tolerance, "string" ends with s:ellipsis)
function! s:shorten_text(text, len) "{{{ returns [string, spare] function! s:shorten_text(text, len) "{{{ returns [string, spare]
let spare_len = a:len - strlen(a:text) " strlen() returns lenght in bytes, not in characters, so we'll have to do a
" trick here -- replace all non-spaces with dot, calculate lengths and
" indexes on it, then use original string to break at selected index.
let text_pattern = substitute(a:text, '\m\S', '.', 'g')
let spare_len = a:len - strlen(text_pattern)
if (spare_len + s:tolerance >= 0) if (spare_len + s:tolerance >= 0)
return [a:text, spare_len] return [a:text, spare_len]
endif endif
" try to break on a space; assumes a:len-s:ell_len >= s:tolerance " try to break on a space; assumes a:len-s:ell_len >= s:tolerance
let newlen = a:len - s:ell_len let newlen = a:len - s:ell_len
let idx = strridx(a:text, ' ', newlen + s:tolerance) let idx = strridx(text_pattern, ' ', newlen + s:tolerance)
let break_idx = (idx + s:tolerance >= newlen) ? idx : newlen let break_idx = (idx + s:tolerance >= newlen) ? idx : newlen
return [a:text[0:break_idx].s:ellipsis, newlen - break_idx] return [matchstr(a:text, '\m^.\{'.break_idx.'\}').s:ellipsis,
\ newlen - break_idx]
endfunction "}}} endfunction "}}}
function! VimwikiFoldText() "{{{ function! VimwikiFoldText() "{{{