Separate filename modify from location parsing

Author: nickspoons

autoload/OmniSharp/actions/definition.vim

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

autoload/OmniSharp/actions/implementations.vim

@@ -49,9 +49,11 @@ function! s:CBFindImplementations(target, opts, locations) abort
   if numImplementations == 0
     echo 'No implementations found'
   elseif numImplementations == 1
-    call OmniSharp#locations#Navigate(a:locations[0])
+    let location = OmniSharp#locations#Modify(a:locations[0])
+    call OmniSharp#locations#Navigate(location)
   else " numImplementations > 1
-    call OmniSharp#locations#SetQuickfix(a:locations,
+    let locations = OmniSharp#locations#Modify(a:locations)
+    call OmniSharp#locations#SetQuickfix(locations,
     \ 'Implementations: ' . a:target)
   endif
   if has_key(a:opts, 'Callback')
@@ -60,17 +62,17 @@ function! s:CBFindImplementations(target, opts, locations) abort
   return numImplementations
 endfunction
 
-function! s:CBPreviewImplementation(locs, ...) abort
-    let numImplementations = len(a:locs)
+function! s:CBPreviewImplementation(locations, ...) abort
+    let numImplementations = len(a:locations)
     if numImplementations == 0
       echo 'No implementations found'
     else
-      call OmniSharp#locations#Preview(a:locs[0])
-      let fname = fnamemodify(a:locs[0].filename, ':.')
+      let location = OmniSharp#locations#Modify(a:locations[0])
+      call OmniSharp#locations#Preview(location)
       if numImplementations == 1
-        echo fname
+        echo location.filename
       else
-        echo fname . ': Implementation 1 of ' . numImplementations
+        echo location.filename . ': Implementation 1 of ' . numImplementations
       endif
     endif
 endfunction

autoload/OmniSharp/actions/symbols.vim

@@ -33,18 +33,19 @@ function! s:CBFindSymbol(filter, locations) abort
     echo 'No symbols found'
     return
   endif
+  let locations = OmniSharp#locations#Modify(a:locations)
   if g:OmniSharp_selector_ui ==? 'clap'
-    call clap#OmniSharp#FindSymbols(a:locations)
+    call clap#OmniSharp#FindSymbols(locations)
   elseif g:OmniSharp_selector_ui ==? 'unite'
-    call unite#start([['OmniSharp/findsymbols', a:locations]])
+    call unite#start([['OmniSharp/findsymbols', locations]])
   elseif g:OmniSharp_selector_ui ==? 'ctrlp'
-    call ctrlp#OmniSharp#findsymbols#setsymbols(a:locations)
+    call ctrlp#OmniSharp#findsymbols#setsymbols(locations)
     call ctrlp#init(ctrlp#OmniSharp#findsymbols#id())
   elseif g:OmniSharp_selector_ui ==? 'fzf'
-    call fzf#OmniSharp#FindSymbols(a:locations)
+    call fzf#OmniSharp#FindSymbols(locations)
   else
     let title = 'Symbols' . (len(a:filter) ? ': ' . a:filter : '')
-    call OmniSharp#locations#SetQuickfix(a:locations, title)
+    call OmniSharp#locations#SetQuickfix(locations, title)
   endif
 endfunction
 

autoload/OmniSharp/actions/usages.vim

@@ -47,12 +47,16 @@ function! s:CBFindUsages(target, locations) abort
   let numUsages = len(a:locations)
   if numUsages == 0
     echo 'No usages found'
-  elseif get(g:, 'OmniSharp_selector_findusages', '') ==? 'fzf'
-    call fzf#OmniSharp#FindUsages(a:locations, a:target)
+    return 0
+  endif
+
+  let locations = OmniSharp#locations#Modify(a:locations)
+  if get(g:, 'OmniSharp_selector_findusages', '') ==? 'fzf'
+    call fzf#OmniSharp#FindUsages(locations, a:target)
   elseif get(g:, 'OmniSharp_selector_findusages', '') ==? 'clap'
-    call clap#OmniSharp#FindUsages(a:locations, a:target)
+    call clap#OmniSharp#FindUsages(locations, a:target)
   else
-    call OmniSharp#locations#SetQuickfix(a:locations, 'Usages: ' . a:target)
+    call OmniSharp#locations#SetQuickfix(locations, 'Usages: ' . a:target)
   endif
   return numUsages
 endfunction

autoload/OmniSharp/actions/usings.vim

@@ -46,7 +46,8 @@ endfunction
 function! s:CBFixUsings(opts, locations) abort
   let numAmbiguous = len(a:locations)
   if numAmbiguous > 0
-    call OmniSharp#locations#SetQuickfix(a:locations, 'Ambiguous usings')
+    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)

autoload/OmniSharp/locations.vim

@@ -1,6 +1,39 @@
 let s:save_cpo = &cpoptions
 set cpoptions&vim
 
+let s:dir_separator = fnamemodify('.', ':p')[-1 :]
+
+function! OmniSharp#locations#Modify(locations) abort
+  " a:locations may be either a single 'quickfix' location, or list of locations
+  let locs = copy(type(a:locations) == type([]) ? a:locations : [a:locations])
+  for location in locs
+    let location.filename = OmniSharp#locations#ModifyPath(location.filename)
+  endfor
+  return type(a:locations) == type([]) ? locs : locs[0]
+endfunction
+
+function! OmniSharp#locations#ModifyPath(filename) abort
+  let modifiers = get(g:, 'OmniSharp_filename_modifiers', ':.')
+
+  if modifiers ==# 'relative'
+    let filename = fnamemodify(a:filename, ':p')
+    let common = escape(getcwd(), '\')
+    let relpath = substitute(filename, '^' . common . s:dir_separator, '', '')
+    let relprefix = ''
+    while relpath ==# filename && common !=# fnamemodify(common, ':h')
+      let common = fnamemodify(common, ':h')
+      let relpath = substitute(filename, '^' . common . s:dir_separator, '', '')
+      let relprefix .= '..' . s:dir_separator
+    endwhile
+    if common !=# fnamemodify(common, ':h')
+      return relprefix . relpath
+    endif
+    let modifiers = ':p'
+  endif
+
+  return fnamemodify(a:filename, modifiers)
+endfunction
+
 " Navigate to location.
 " a:location: A location dict, or list of location dicts. The location or
 "             locations have the same format as a quickfix list entry.

autoload/OmniSharp/util.vim

@@ -280,25 +280,7 @@ function! OmniSharp#util#TranslatePathForClient(filename) abort
     let filename = OmniSharp#util#TempDir() . '/' . fnamemodify(filename, ':t')
   endif
 
-  let modifiers = get(g:, 'OmniSharp_filename_modifiers', ':.')
-
-  if modifiers ==# 'relative'
-    let filename = fnamemodify(filename, ':p')
-    let common = escape(getcwd(), '\')
-    let relpath = substitute(filename, '^' . common . s:dir_separator, '', '')
-    let relprefix = ''
-    while relpath ==# filename && common !=# fnamemodify(common, ':h')
-      let common = fnamemodify(common, ':h')
-      let relpath = substitute(filename, '^' . common . s:dir_separator, '', '')
-      let relprefix .= '..' . s:dir_separator
-    endwhile
-    if common !=# fnamemodify(common, ':h')
-      return relprefix . relpath
-    endif
-    let modifiers = ':p'
-  endif
-
-  return fnamemodify(filename, modifiers)
+  return fnamemodify(filename, ':p')
 endfunction
 
 function! OmniSharp#util#TranslatePathForServer(filename) abort

doc/omnisharp-vim.txt

@@ -415,7 +415,7 @@ File paths returned from the server are normalized using Vim
 |filename-modifiers|. The |g:OmniSharp_filename_modifiers| variable allows
 configuring which modifiers are used.
 Additionally, the special value "relative" may be used to force all paths into
-a relatve format, e.g. "../../project/file.cs".
+a relative format, e.g. "../../project/file.cs".
 Default: :. >
     let g:OmniSharp_filename_modifiers = ':p:~'
 <or >