Add :OmniSharpFold command to fold classes/methods

Author: nickspoons

autoload/OmniSharp/actions/codestructure.vim

@@ -1,11 +1,11 @@
 let s:save_cpo = &cpoptions
 set cpoptions&vim
 
-function! OmniSharp#actions#codestructure#Get(bufnr, Callback) abort
+function! OmniSharp#actions#codestructure#Get(bufnr, sendbuffer, Callback) abort
   let opts = {
   \ 'ResponseHandler': function('s:CodeStructureRH', [a:bufnr, a:Callback]),
   \ 'BufNum': a:bufnr,
-  \ 'SendBuffer': 0
+  \ 'SendBuffer': a:sendbuffer
   \}
   call OmniSharp#stdio#Request('/v2/codestructure', opts)
 endfunction

autoload/OmniSharp/actions/fold.vim

@@ -0,0 +1,43 @@
+let s:save_cpo = &cpoptions
+set cpoptions&vim
+
+function! OmniSharp#actions#fold#Create() abort
+  if !g:OmniSharp_server_stdio
+    echomsg 'This functionality is only available with the stdio server'
+  endif
+  call OmniSharp#actions#codestructure#Get(bufnr('%'), 1,
+  \ function('s:CreateFolds'))
+endfunction
+
+function! s:CreateFolds(bufnr, codeElements) abort
+  if a:bufnr != bufnr('%') | return | endif
+  setlocal foldmethod=manual
+  normal! zE
+  for range in reverse(s:FindBlocks(a:codeElements))
+    execute printf('%d,%dfold', range[0], range[1])
+  endfor
+endfunction
+
+function! s:FindBlocks(codeElements) abort
+  if type(a:codeElements) != type([]) | return [] | endif
+  let ranges = []
+  for element in a:codeElements
+    if get(element, 'Kind', '') !=# 'namespace'
+      if has_key(element, 'Ranges') && has_key(element.Ranges, 'full')
+        let full = element.Ranges.full
+        let start = get(get(full, 'Start', {}), 'Line', 0)
+        let end = get(get(full, 'End', {}), 'Line', 0)
+        if end - start >= &foldminlines
+          call add(ranges, [start, end])
+        endif
+      endif
+    endif
+    call extend(ranges, s:FindBlocks(get(element, 'Children', [])))
+  endfor
+  return ranges
+endfunction
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
+
+" vim:et:sw=2:sts=2

autoload/OmniSharp/actions/test.vim

@@ -14,7 +14,7 @@ function! OmniSharp#actions#test#Run(...) abort
     return
   endif
   let s:runningTest = 1
-  call OmniSharp#actions#codestructure#Get(bufnr,
+  call OmniSharp#actions#codestructure#Get(bufnr, 0,
   \ function('s:RunTest', [function('s:CBRunTest')]))
 endfunction
 
@@ -176,7 +176,7 @@ endfunction
 
 function! s:FindTestsInFiles(Callback, buffers, ...) abort
   call OmniSharp#util#AwaitParallel(
-  \ map(copy(a:buffers), {i,b -> function('OmniSharp#actions#codestructure#Get', [b])}),
+  \ map(copy(a:buffers), {i,b -> function('OmniSharp#actions#codestructure#Get', [b, 0])}),
   \ function('s:RunTestsInFiles', [a:Callback]))
 endfunction
 

ftplugin/cs/OmniSharp.vim

@@ -34,6 +34,7 @@ command! -buffer -bar -nargs=? OmniSharpFindSymbol call OmniSharp#actions#symbol
 command! -buffer -bar -nargs=? OmniSharpFindType call OmniSharp#actions#symbols#Find(<q-args>, 'Type')
 command! -buffer -bar OmniSharpFindUsages call OmniSharp#actions#usages#Find()
 command! -buffer -bar OmniSharpFixUsings call OmniSharp#actions#usings#Fix()
+command! -buffer -bar OmniSharpFold call OmniSharp#actions#fold#Create()
 command! -buffer -bar OmniSharpGetCodeActions call OmniSharp#actions#codeactions#Get('normal')
 command! -buffer -bar OmniSharpGlobalCodeCheck call OmniSharp#actions#diagnostics#CheckGlobal()
 command! -buffer -bar OmniSharpGotoDefinition call OmniSharp#actions#definition#Find()
@@ -59,6 +60,7 @@ nnoremap <buffer> <Plug>(omnisharp_find_symbol) :OmniSharpFindSymbol<CR>
 nnoremap <buffer> <Plug>(omnisharp_find_type) :OmniSharpFindType<CR>
 nnoremap <buffer> <Plug>(omnisharp_find_usages) :OmniSharpFindUsages<CR>
 nnoremap <buffer> <Plug>(omnisharp_fix_usings) :OmniSharpFixUsings<CR>
+nnoremap <buffer> <Plug>(omnisharp_fold) :OmniSharpFold<CR>
 nnoremap <buffer> <Plug>(omnisharp_code_actions) :OmniSharpGetCodeActions<CR>
 xnoremap <buffer> <Plug>(omnisharp_code_actions) :call OmniSharp#actions#codeactions#Get('visual')<CR>
 nnoremap <buffer> <Plug>(omnisharp_code_action_repeat) :OmniSharpRepeatCodeAction<CR>
@@ -105,6 +107,7 @@ let b:undo_ftplugin .= '
 \| delcommand OmniSharpFindType
 \| delcommand OmniSharpFindUsages
 \| delcommand OmniSharpFixUsings
+\| delcommand OmniSharpFold
 \| delcommand OmniSharpGetCodeActions
 \| delcommand OmniSharpGlobalCodeCheck
 \| delcommand OmniSharpGotoDefinition