When callback present, don't navigate.

Callback receives full location, not just count.
Everywhere except for GotoDefinition.

Author: amosonn

autoload/OmniSharp/actions/implementations.vim

@@ -2,17 +2,22 @@ let s:save_cpo = &cpoptions
 set cpoptions&vim
 
 " Accepts a Funcref callback argument, to be called after the response is
-" returned (synchronously or asynchronously) with the number of implementations
+" returned (synchronously or asynchronously) with the list of found locations.
+" This is done instead of navigating to them or showing a quick-fix.
 function! OmniSharp#actions#implementations#Find(...) abort
-  let opts = a:0 && a:1 isnot 0 ? { 'Callback': a:1 } : {}
-  let target = expand('<cword>')
+  if a:0 && a:1 isnot 0
+    let Callback = a:1
+  else
+    let target = expand('<cword>')
+    let Callback = function('s:CBFindImplementations', [target])
+  endif
+
   if g:OmniSharp_server_stdio
-    let Callback = function('s:CBFindImplementations', [target, opts])
     call s:StdioFind(Callback)
   else
     let locs = OmniSharp#py#Eval('findImplementations()')
     if OmniSharp#py#CheckForError() | return | endif
-    return s:CBFindImplementations(target, opts, locs)
+    return Callback(locs)
   endif
 endfunction
 
@@ -44,7 +49,7 @@ function! s:StdioFindRH(Callback, response) abort
   endif
 endfunction
 
-function! s:CBFindImplementations(target, opts, locations) abort
+function! s:CBFindImplementations(target, locations) abort
   let numImplementations = len(a:locations)
   if numImplementations == 0
     echo 'No implementations found'
@@ -55,9 +60,6 @@ function! s:CBFindImplementations(target, opts, locations) abort
     call OmniSharp#locations#SetQuickfix(locations,
     \ 'Implementations: ' . a:target)
   endif
-  if has_key(a:opts, 'Callback')
-    call a:opts.Callback(numImplementations)
-  endif
   return numImplementations
 endfunction
 

autoload/OmniSharp/actions/members.vim

@@ -2,15 +2,22 @@ let s:save_cpo = &cpoptions
 set cpoptions&vim
 
 " Accepts a Funcref callback argument, to be called after the response is
-" returned (synchronously or asynchronously) with the number of members
+" returned (synchronously or asynchronously) with the list of found locations
+" of members.
+" This is done instead of showing a quick-fix.
 function! OmniSharp#actions#members#Find(...) abort
-  let opts = a:0 && a:1 isnot 0 ? { 'Callback': a:1 } : {}
+  if a:0 && a:1 isnot 0
+    let Callback = a:1
+  else
+    let Callback = function('s:CBFindMembers')
+  endif
+
   if g:OmniSharp_server_stdio
-    call s:StdioFind(function('s:CBFindMembers', [opts]))
+    call s:StdioFind(Callback)
   else
     let locs = OmniSharp#py#Eval('findMembers()')
     if OmniSharp#py#CheckForError() | return | endif
-    return s:CBFindMembers(opts, locs)
+    return Callback(locs)
   endif
 endfunction
 
@@ -83,14 +90,11 @@ function! ReduceToOneCharacter(textBeforeDisplayName) abort
   return s:SingleCharacterSymbolByAccessModifier[accessModifier] . a:textBeforeDisplayName[accessModifierLen:]
 endfunction
 
-function! s:CBFindMembers(opts, locations) abort
+function! s:CBFindMembers(locations) abort
   let numMembers = len(a:locations)
   if numMembers > 0
     call OmniSharp#locations#SetQuickfixWithVerticalAlign(a:locations, 'Members')
   endif
-  if has_key(a:opts, 'Callback')
-    call a:opts.Callback(numMembers)
-  endif
   return numMembers
 endfunction
 

autoload/OmniSharp/actions/usings.vim

@@ -2,16 +2,22 @@ let s:save_cpo = &cpoptions
 set cpoptions&vim
 
 " Accepts a Funcref callback argument, to be called after the response is
-" returned (synchronously or asynchronously) with the number of ambiguous usings
+" returned (synchronously or asynchronously) with the list of locations of
+" ambiguous usings.
+" This is done instead of showing a quick-fix.
 function! OmniSharp#actions#usings#Fix(...) abort
-  let opts = a:0 && a:1 isnot 0 ? { 'Callback': a:1 } : {}
+  if a:0 && a:1 isnot 0
+    let Callback = a:1
+  else
+    let Callback = function('s:CBFixUsings')
+  endif
+
   if g:OmniSharp_server_stdio
-    let Callback = function('s:CBFixUsings', [opts])
     call s:StdioFix(Callback)
   else
     let locs = OmniSharp#py#Eval('fixUsings()')
     if OmniSharp#py#CheckForError() | return | endif
-    return s:CBFixUsings(opts, locs)
+    return Callback(locs)
   endif
 endfunction
 
@@ -43,15 +49,12 @@ function! s:StdioFixRH(Callback, response) abort
   endif
 endfunction
 
-function! s:CBFixUsings(opts, locations) abort
+function! s:CBFixUsings(locations) abort
   let numAmbiguous = len(a:locations)
   if numAmbiguous > 0
     let locations = OmniSharp#locations#Modify(a:locations)
     call OmniSharp#locations#SetQuickfix(locations, 'Ambiguous usings')
   endif
-  if has_key(a:opts, 'Callback')
-    call a:opts.Callback(numAmbiguous)
-  endif
   return numAmbiguous
 endfunction