Override g:OmniSharp_edit_command for code edits

Author: nickspoons

autoload/OmniSharp/locations.vim

@@ -1,15 +1,22 @@
 let s:save_cpo = &cpoptions
 set cpoptions&vim
 
-function! OmniSharp#locations#Navigate(location, noautocmds) abort
+function! OmniSharp#locations#Navigate(location, silentedit) abort
   if a:location.filename !=# ''
     " Update the ' mark, adding this location to the jumplist.
     normal! m'
     if fnamemodify(a:location.filename, ':p') !=# expand('%:p')
-      execute
-      \ (a:noautocmds ? 'noautocmd' : '')
-      \ (&modified && !&hidden ? 'split' : get(g:, 'OmniSharp_edit_command', 'edit'))
-      \ fnameescape(a:location.filename)
+      let editcommand = get(g:, 'OmniSharp_edit_command', 'edit')
+      if a:silentedit
+        let editcommand = 'edit'
+      endif
+      if &modified && !&hidden && editcommand ==# 'edit'
+        let editcommand = 'split'
+      endif
+      if a:silentedit
+        let editcommand = 'noautocmd ' . editcommand
+      endif
+      execute editcommand fnameescape(a:location.filename)
     endif
     if get(a:location, 'lnum', 0) > 0
       let col = get(a:location, 'vcol', 0)

python/omnisharp/commands.py

@@ -17,10 +17,10 @@
 ctx = VimUtilCtx(vim)
 
 
-def openFile(filename, line=0, column=0, noautocmd=0):
+def openFile(filename, line=0, column=0, silentedit=0):
     vim.command("let l:loc = {{ 'filename': '{0}', 'lnum': {1}, 'col': {2} }}"
                 .format(filename, line, column))
-    vim.command("call OmniSharp#locations#Navigate(l:loc, {0})".format(noautocmd))
+    vim.command("call OmniSharp#locations#Navigate(l:loc, {0})".format(silentedit))
 
 
 def setBuffer(text):
@@ -130,7 +130,7 @@ def runCodeAction(mode, action):
         vim.command('let l:hidden_bak = &hidden | set hidden')
         for changeDefinition in changes:
             filename = formatPathForClient(ctx, changeDefinition['FileName'])
-            openFile(filename, noautocmd=1)
+            openFile(filename, silentedit=1)
             if not setBuffer(changeDefinition.get('Buffer')):
                 for change in changeDefinition.get('Changes', []):
                     setBuffer(change.get('NewText'))