vim/tabular
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use strdisplaywidth where available

Browse Source 
In vim 7.3, the strdisplaywidth function was added to give an accurate
count of the number of screen columns that will be taken up by a given
string.  Tabular was written before vim 7.3, and was implementing this
functionality itself (at least for tabs; it wasn't trying to handle
doublewide characters).

This changeset allows us to take advantage of strdisplaywidth where it
exists.
This commit is contained in:
Matt Wozniski 2012-10-21 22:37:02 -04:00
parent d3acca35fd
commit 7f6f1723a2
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
autoload/tabular.vim
View File

@ -46,22 +46,30 @@ set cpo&vim
" Return the number of bytes in a string after expanding tabs to spaces. {{{2 " Return the number of bytes in a string after expanding tabs to spaces. {{{2
" This expansion is done based on the current value of 'tabstop' " This expansion is done based on the current value of 'tabstop'
function! s:Strlen(string) if exists('*strdisplaywidth')
let rv = 0 " Needs vim 7.3
let i = 0 let s:Strlen = function("strdisplaywidth")
else
function! s:Strlen(string)
" Implement the tab handling part of strdisplaywidth for vim 7.2 and
" earlier - not much that can be done about handling doublewidth
" characters.
let rv = 0
let i = 0
for char in split(a:string, '\zs') for char in split(a:string, '\zs')
if char == "\t" if char == "\t"
let rv += &ts - i let rv += &ts - i
let i = 0 let i = 0
else else
let rv += 1 let rv += 1
let i = (i + 1) % &ts let i = (i + 1) % &ts
endif endif
endfor endfor
return rv return rv
endfunction endfunction
endif
" Align a string within a field {{{2 " Align a string within a field {{{2
" These functions do not trim leading and trailing spaces. " These functions do not trim leading and trailing spaces.