vim-patch:8.1.1079: no need for a separate ScreenLinesUtf8() test function

Problem:    No need for a separate ScreenLinesUtf8() test function.
Solution:   Get the composing characters with ScreenLines().
48aed0824e
This commit is contained in:
zeertzjq 2021-09-19 13:13:44 +08:00
parent 32663b0f7e
commit c14dc616bf
2 changed files with 2 additions and 20 deletions

View File

@ -91,7 +91,7 @@ func Test_screenchar_utf8()
call assert_equal("", screenstring(1, 4))
call assert_equal("\u3046\u3099", screenstring(1, 5))
call assert_equal([text . ' '], ScreenLinesUtf8(1, 8))
call assert_equal([text . ' '], ScreenLines(1, 8))
bwipe!
endfunc

View File

@ -16,28 +16,10 @@ func Screenline(lnum)
return matchstr(line, '^.\{-}\ze\s*$')
endfunc
" ScreenLines(lnum, width) or
" ScreenLines([start, end], width)
function! ScreenLines(lnum, width) abort
redraw!
if type(a:lnum) == v:t_list
let start = a:lnum[0]
let end = a:lnum[1]
else
let start = a:lnum
let end = a:lnum
endif
let lines = []
for l in range(start, end)
let lines += [join(map(range(1, a:width), 'nr2char(screenchar(l, v:val))'), '')]
endfor
return lines
endfunction
" Get text on the screen, including composing characters.
" ScreenLines(lnum, width) or
" ScreenLines([start, end], width)
function! ScreenLinesUtf8(lnum, width) abort
function! ScreenLines(lnum, width) abort
redraw!
if type(a:lnum) == v:t_list
let start = a:lnum[0]