Add optional callback to FindSymbol/FindType

Author: nickspoons

autoload/OmniSharp/actions/symbols.vim

@@ -1,17 +1,60 @@
 let s:save_cpo = &cpoptions
 set cpoptions&vim
 
+" Find all project symbols, or all symbols including a search substring. Symbol
+" locations are loaded in the configured selector, :help g:OmniSharp_selector_ui
+" Optional arguments:
+" symbolName: Partial name of the symbol to search for.
+" Callback: When a callback is passed in, it is called after the response is
+"           returned (synchronously or asynchronously) with the found symbol
+"           locations.
 function! OmniSharp#actions#symbols#Find(...) abort
-  let filter = a:0 && a:1 isnot 0 ? a:1 : ''
-  let symbolfilter = a:0 == 2 ? a:2 : 'TypeAndMember'
+  if a:0 && type(a:1) == type('')
+    let filter = a:1
+  elseif a:0 > 1 && type(a:2) == type('')
+    let filter = a:2
+  else
+    let filter = ''
+  endif
+  if a:0 && type(a:1) == type(function('tr'))
+    let Callback = a:1
+  elseif a:0 > 1 && type(a:2) == type(function('tr'))
+    let Callback = a:2
+  else
+    let Callback = function('s:CBFindSymbol', [filter])
+  endif
+  call s:Find(filter, 'TypeAndMember', Callback)
+endfunction
+
+" Find all project types. This function is similar to
+" OmniSharp#actions#symbols#Find() but returns fewer results, and can be
+" significanltly faster in a large codebase.
+function! OmniSharp#actions#symbols#FindType(...) abort
+  if a:0 && type(a:1) == type('')
+    let filter = a:1
+  elseif a:0 > 1 && type(a:2) == type('')
+    let filter = a:2
+  else
+    let filter = ''
+  endif
+  if a:0 && type(a:1) == type(function('tr'))
+    let Callback = a:1
+  elseif a:0 > 1 && type(a:2) == type(function('tr'))
+    let Callback = a:2
+  else
+    let Callback = function('s:CBFindSymbol', [filter])
+  endif
+  call s:Find(filter, 'Type', Callback)
+endfunction
+
+function! s:Find(filter, symbolfilter, Callback) abort
   if !OmniSharp#IsServerRunning() | return | endif
   if g:OmniSharp_server_stdio
-    let Callback = function('s:CBFindSymbol', [filter])
-    call s:StdioFind(filter, symbolfilter, Callback)
+    call s:StdioFind(a:filter, a:symbolfilter, a:Callback)
   else
-    let locs = OmniSharp#py#Eval(printf('findSymbols(%s, %s)', string(filter), string(symbolfilter)))
+    let locs = OmniSharp#py#Eval(printf('findSymbols(%s, %s)', string(a:filter), string(a:symbolfilter)))
     if OmniSharp#py#CheckForError() | return | endif
-    return s:CBFindSymbol(filter, locs)
+    return a:Callback(locs)
   endif
 endfunction
 

ftplugin/cs/OmniSharp.vim

@@ -31,7 +31,7 @@ command! -buffer -bar OmniSharpDocumentation call OmniSharp#actions#documentatio
 command! -buffer -bar OmniSharpFindImplementations call OmniSharp#actions#implementations#Find()
 command! -buffer -bar OmniSharpFindMembers call OmniSharp#actions#members#Find()
 command! -buffer -bar -nargs=? OmniSharpFindSymbol call OmniSharp#actions#symbols#Find(<q-args>)
-command! -buffer -bar -nargs=? OmniSharpFindType call OmniSharp#actions#symbols#Find(<q-args>, 'Type')
+command! -buffer -bar -nargs=? OmniSharpFindType call OmniSharp#actions#symbols#FindType(<q-args>)
 command! -buffer -bar OmniSharpFindUsages call OmniSharp#actions#usages#Find()
 command! -buffer -bar OmniSharpFixUsings call OmniSharp#actions#usings#Fix()
 command! -buffer -bar OmniSharpGetCodeActions call OmniSharp#actions#codeactions#Get('normal')