Use navigate#Up/Down callbacks in HTTP mode

Author: nickspoons

autoload/OmniSharp/actions/navigate.vim

@@ -21,8 +21,9 @@ function! s:Navigate(down, Callback) abort
     let opts = { 'ResponseHandler': RH }
     call OmniSharp#stdio#Request(a:down ? '/navigatedown' : '/navigateup', opts)
   else
-    call OmniSharp#py#Eval(a:down ? 'navigateDown()' : 'navigateUp()')
-    call OmniSharp#py#CheckForError()
+    let loc = OmniSharp#py#Eval(a:down ? 'navigateDown()' : 'navigateUp()')
+    if OmniSharp#py#CheckForError() | return | endif
+    call a:Callback(loc)
   endif
 endfunction
 

python/omnisharp/commands.py

@@ -266,17 +266,25 @@ def findHighlightTypes():
 
 @vimcmd
 def navigateUp():
-    get_navigate_response('/navigateup')
+    return get_navigate_response('/navigateup')
 
 
 @vimcmd
 def navigateDown():
-    get_navigate_response('/navigatedown')
+    return get_navigate_response('/navigatedown')
 
 
 def get_navigate_response(endpoint):
     response = getResponse(ctx, endpoint, json=True)
-    vim.current.window.cursor = (response['Line'], response['Column'] - 1)
+    if response.get('Line'):
+        return {
+            'filename': formatPathForServer(ctx, ctx.buffer_name),
+            'text': '',
+            'lnum': response['Line'],
+            'col': response['Column'],
+            'vcol': 0
+        }
+    return None
 
 
 @vimcmd