Do not modify filenames before navigate/preview

Author: nickspoons

autoload/OmniSharp/actions/definition.vim

@@ -78,8 +78,7 @@ function! s:CBGotoDefinition(opts, location, metadata) abort
       let found = 0
     endif
   else
-    let location = OmniSharp#locations#Modify(a:location)
-    let found = OmniSharp#locations#Navigate(location, a:opts.editcommand)
+    let found = OmniSharp#locations#Navigate(a:location, a:opts.editcommand)
   endif
   if has_key(a:opts, 'Callback') && !went_to_metadata
     call a:opts.Callback(found)
@@ -97,9 +96,8 @@ function! s:CBPreviewDefinition(opts, location, metadata) abort
       echo 'Not found'
     endif
   else
-    let location = OmniSharp#locations#Modify(a:location)
-    call OmniSharp#locations#Preview(location)
-    echo fnamemodify(a:location.filename, ':.')
+    call OmniSharp#locations#Preview(a:location)
+    echo OmniSharp#locations#Modify(a:location).filename
   endif
 endfunction
 

autoload/OmniSharp/actions/implementations.vim

@@ -49,8 +49,7 @@ function! s:CBFindImplementations(target, opts, locations) abort
   if numImplementations == 0
     echo 'No implementations found'
   elseif numImplementations == 1
-    let location = OmniSharp#locations#Modify(a:locations[0])
-    call OmniSharp#locations#Navigate(location)
+    call OmniSharp#locations#Navigate(a:locations[0])
   else " numImplementations > 1
     let locations = OmniSharp#locations#Modify(a:locations)
     call OmniSharp#locations#SetQuickfix(locations,
@@ -67,12 +66,12 @@ function! s:CBPreviewImplementation(locations, ...) abort
     if numImplementations == 0
       echo 'No implementations found'
     else
-      let location = OmniSharp#locations#Modify(a:locations[0])
-      call OmniSharp#locations#Preview(location)
+      call OmniSharp#locations#Preview(a:locations[0])
+      let filename = OmniSharp#locations#Modify(a:locations[0]).filename
       if numImplementations == 1
-        echo location.filename
+        echo filename
       else
-        echo location.filename . ': Implementation 1 of ' . numImplementations
+        echo filename . ': Implementation 1 of ' . numImplementations
       endif
     endif
 endfunction