maintain current fold level in also operator mapping

Author: rhysd

autoload/clang_format.vim

@@ -218,18 +218,15 @@ endfunction
 " }}}
 
 " replace buffer {{{
-function! clang_format#replace(line1, line2) abort
+function! clang_format#replace(line1, line2, ...) abort
 
     call s:verify_command()
 
-    let pos_save = getpos('.')
-    let screen_save = line('w0')
+    let pos_save = a:0 >= 1 ? a:1 : getpos('.')
+    let screen_save = a:0 >= 2 ? a:2 : line('w0')
     let sel_save = &l:selection
     let &l:selection = 'inclusive'
-    let fold_save = 0
-    if &foldenable
-        let fold_save = foldlevel(line('.'))
-    endif
+    let fold_closed_save = foldclosed(line('.'))
     let [save_g_reg, save_g_regtype] = [getreg('g'), getregtype('g')]
     let [save_unnamed_reg, save_unnamed_regtype] = [getreg(v:register), getregtype(v:register)]
 
@@ -246,18 +243,13 @@ function! clang_format#replace(line1, line2) abort
         call setreg('g', save_g_reg, save_g_regtype)
         let &l:selection = sel_save
         call setpos('.', pos_save)
-        call s:restore_screen_pos(screen_save)
-        if fold_save > 0
-            let level = foldlevel(line('.'))
-            while fold_save > level
+        if fold_closed_save == -1
+            let l = line('.')
+            while foldclosed(l) >= 0
                 foldopen
-                let l = foldlevel(line('.'))
-                if l == level
-                    break
-                endif
-                let level = l
             endwhile
         endif
+        call s:restore_screen_pos(screen_save)
     endtry
 endfunction
 " }}}

autoload/operator/clang_format.vim

@@ -2,30 +2,17 @@ function! s:is_empty_region(begin, end) abort
     return a:begin[1] > a:end[1] || (a:begin[1] == a:end[1] && a:end[2] < a:begin[2])
 endfunction
 
-function! s:restore_screen_pos() abort
-    let line_diff = line('w0') - g:operator#clang_format#save_screen_pos
-    if line_diff > 0
-        execute 'silent normal!' line_diff."\<C-y>"
-    elseif line_diff < 0
-        execute 'silent normal!' (-line_diff)."\<C-e>"
-    endif
-endfunction
-
 function! operator#clang_format#do(motion_wise) abort
     if s:is_empty_region(getpos("'["), getpos("']"))
         return
     endif
 
-    call clang_format#replace(getpos("'[")[1], getpos("']")[1])
-
     " Do not move cursor and screen
-    if exists('g:operator#clang_format#save_pos')
-        call setpos('.', g:operator#clang_format#save_pos)
+    if exists('g:operator#clang_format#save_pos') && exists('g:operator#clang_format#save_screen_pos')
+        call clang_format#replace(getpos("'[")[1], getpos("']")[1], g:operator#clang_format#save_pos, g:operator#clang_format#save_screen_pos)
         unlet g:operator#clang_format#save_pos
-    endif
-
-    if exists('g:operator#clang_format#save_screen_pos')
-        call s:restore_screen_pos()
         unlet g:operator#clang_format#save_screen_pos
+    else
+        call clang_format#replace(getpos("'[")[1], getpos("']")[1])
     endif
 endfunction