From d4a3462df66c48d8d581254c08b2ff27ba8b5d6a Mon Sep 17 00:00:00 2001
From: Andy Stewart <boss@airbladesoftware.com>
Date: Sat, 22 Oct 2022 17:51:34 +0100
Subject: [PATCH] Extract function to calculate screen lines and cols

See #846.
---
 autoload/gitgutter/hunk.vim | 38 ++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/autoload/gitgutter/hunk.vim b/autoload/gitgutter/hunk.vim
index 5df5dcf..a8aaa5a 100644
--- a/autoload/gitgutter/hunk.vim
+++ b/autoload/gitgutter/hunk.vim
@@ -503,26 +503,13 @@ endfunction
 function! s:populate_hunk_preview_window(header, body)
   if g:gitgutter_preview_win_floating
     if exists('*nvim_open_win')
-      " calculate width of 'content' area
-      let [_virtualedit, &virtualedit]=[&virtualedit, 'all']
-      let cursor = getcurpos()
-      normal! g$
-      let available_width = virtcol('.')
-      call setpos('.', cursor)
-      let &virtualedit=_virtualedit
-
       " Assumes cursor is not in previewing window.
       call nvim_buf_set_var(winbufnr(s:winid), 'hunk_header', a:header)
 
       let [_scrolloff, &scrolloff] = [&scrolloff, 0]
 
-      let width = min([max(map(copy(a:body), 'strdisplaywidth(v:val)')), available_width])
-      if exists('*reduce')
-        let body_length = reduce(a:body, { acc, val -> acc + strdisplaywidth(val) / width + (strdisplaywidth(val) % width == 0 ? 0 : 1) }, 0)
-      else
-        let body_length = eval(join(map(copy(a:body), 'strdisplaywidth(v:val) / width + (strdisplaywidth(v:val) % width == 0 ? 0 : 1)'), '+'))
-      endif
-      let height = min([body_length, g:gitgutter_floating_window_options.height])
+      let [width, height] = s:screen_lines(a:body)
+      let height = min([height, g:gitgutter_floating_window_options.height])
       call nvim_win_set_width(s:winid, width)
       call nvim_win_set_height(s:winid, height)
 
@@ -575,6 +562,27 @@ function! s:populate_hunk_preview_window(header, body)
 endfunction
 
 
+" Calculates the number of columns and the number of screen lines the given
+" array of lines will take up, taking account of wrapping.
+function! s:screen_lines(lines)
+  let [_virtualedit, &virtualedit]=[&virtualedit, 'all']
+  let cursor = getcurpos()
+  normal! g$
+  let available_width = virtcol('.')
+  call setpos('.', cursor)
+  let &virtualedit=_virtualedit
+  let width = min([max(map(copy(a:lines), 'strdisplaywidth(v:val)')), available_width])
+
+  if exists('*reduce')
+    let height = reduce(a:lines, { acc, val -> acc + strdisplaywidth(val) / width + (strdisplaywidth(val) % width == 0 ? 0 : 1) }, 0)
+  else
+    let height = eval(join(map(copy(a:lines), 'strdisplaywidth(v:val) / width + (strdisplaywidth(v:val) % width == 0 ? 0 : 1)'), '+'))
+  endif
+
+  return [width, height]
+endfunction
+
+
 function! s:enable_staging_from_hunk_preview_window()
   augroup gitgutter_hunk_preview
     autocmd!