Mercurial > vim

diff src/testdir/view_util.vim @ 16148:90b0f2227d73 v8.1.1079

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1079: no need for a separate ScreenLinesUtf8() test function commit https://github.com/vim/vim/commit/48aed0824e47147faf19fc235ad4bcf851584c9c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 30 15:44:17 2019 +0100 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().
author Bram Moolenaar <Bram@vim.org>
date Sat, 30 Mar 2019 15:45:05 +0100
parents eb087f8a26a8
children 7927cf327396
line wrap: on
line diff
--- a/src/testdir/view_util.vim
+++ b/src/testdir/view_util.vim
@@ -5,7 +5,7 @@ if exists('*ScreenLines')
   finish
 endif
 
-" Get text on the screen, without composing characters.
+" Get text on the screen, including composing characters.
 " ScreenLines(lnum, width) or
 " ScreenLines([start, end], width)
 function! ScreenLines(lnum, width) abort
@@ -19,25 +19,6 @@ function! ScreenLines(lnum, width) abort
   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
-  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), 'screenstring(l, v:val)'), '')]
   endfor
   return lines