Remove indirection of s:MetadataFind

Author: amosonn

autoload/OmniSharp/actions/definition.vim

@@ -65,54 +65,14 @@ function! s:StdioFindRH(Callback, response) abort
     if g:OmniSharp_lookup_metadata
     \ && type(body) == type({})
     \ && type(body.MetadataSource) == type({})
-      call s:MetadataFind(a:Callback, body)
+      let Callback = function('s:CBMetadataFind', [a:Callback])
+      call s:StdioMetadataFind(Callback, body)
     else
       call a:Callback(0, 1)
     endif
   endif
 endfunction
 
-function! s:CBGotoDefinition(opts, location, fromMetadata) abort
-  if type(a:location) != type({}) " Check whether a dict was returned
-    echo 'Not found'
-    let found = 0
-  else
-    let found = OmniSharp#locations#Navigate(a:location, get(a:opts, 'editcommand', 'edit'))
-    if found && a:fromMetadata
-      setlocal nomodifiable readonly
-    endif
-  endif
-  if has_key(a:opts, 'Callback')
-    call a:opts.Callback(found)
-  endif
-  return found
-endfunction
-
-function! s:CBPreviewDefinition(location, fromMetadata) abort
-  if type(a:location) != type({}) " Check whether a dict was returned
-    echo 'Not found'
-  else
-    let jumped_from_preview = &previewwindow
-    call OmniSharp#locations#Preview(a:location)
-    echo OmniSharp#locations#Modify(a:location).filename
-    if a:fromMetadata && !jumped_from_preview && &previewwindow
-      silent wincmd p
-    endif
-  endif
-endfunction
-
-function! s:MetadataFind(callback, metadata) abort
-  if g:OmniSharp_server_stdio
-    let Callback = function('s:CBMetadataFind', [a:callback])
-    call s:StdioMetadataFind(Callback, a:metadata)
-    return 1
-  else
-    echomsg 'GotoMetadata is not supported with the HTTP OmniSharp server. '
-    \ . 'Please consider upgrading to the stdio version.'
-    return 0
-  endif
-endfunction
-
 function! s:StdioMetadataFind(Callback, metadata) abort
   let opts = {
   \ 'ResponseHandler': function('s:StdioMetadataFindRH', [a:Callback, a:metadata]),
@@ -126,7 +86,7 @@ function! s:StdioMetadataFindRH(Callback, metadata, response) abort
   call a:Callback(a:response.Body, a:metadata)
 endfunction
 
-function! s:CBMetadataFind(callback, response, metadata) abort
+function! s:CBMetadataFind(Callback, response, metadata) abort
   let host = OmniSharp#GetHost()
   let metadata_filename = fnamemodify(
   \ OmniSharp#util#TranslatePathForClient(a:response.SourceName), ':t')
@@ -142,7 +102,36 @@ function! s:CBMetadataFind(callback, response, metadata) abort
   \ 'lnum': a:metadata.Line,
   \ 'col': a:metadata.Column
   \}
-  call a:callback(location, 1)
+  call a:Callback(location, 1)
+endfunction
+
+function! s:CBGotoDefinition(opts, location, fromMetadata) abort
+  if type(a:location) != type({}) " Check whether a dict was returned
+    echo 'Not found'
+    let found = 0
+  else
+    let found = OmniSharp#locations#Navigate(a:location, get(a:opts, 'editcommand', 'edit'))
+    if found && a:fromMetadata
+      setlocal nomodifiable readonly
+    endif
+  endif
+  if has_key(a:opts, 'Callback')
+    call a:opts.Callback(found)
+  endif
+  return found
+endfunction
+
+function! s:CBPreviewDefinition(location, fromMetadata) abort
+  if type(a:location) != type({}) " Check whether a dict was returned
+    echo 'Not found'
+  else
+    let jumped_from_preview = &previewwindow
+    call OmniSharp#locations#Preview(a:location)
+    echo OmniSharp#locations#Modify(a:location).filename
+    if a:fromMetadata && !jumped_from_preview && &previewwindow
+      silent wincmd p
+    endif
+  endif
 endfunction
 
 let &cpoptions = s:save_cpo