Refactor completion plugins to pass opts dict

Author: nickspoons

autoload/OmniSharp.vim

@@ -52,7 +52,8 @@ function! OmniSharp#Complete(findstart, base) abort
     endwhile
     return start
   else
-    return OmniSharp#actions#complete#Get(a:base)
+    let opts = { 'startcol': col('.') - 1 }
+    return OmniSharp#actions#complete#Get(a:base, opts)
   endif
 endfunction
 

autoload/OmniSharp/actions/complete.vim

@@ -4,15 +4,14 @@ set cpoptions&vim
 let s:generated_snippets = get(s:, 'generated_snippets', {})
 let s:last_completion_dictionary = get(s:, 'last_completion_dictionary', {})
 
-function! OmniSharp#actions#complete#Get(partial, ...) abort
-  let opts = a:0 ? { 'Callback': a:1 } : {}
+function! OmniSharp#actions#complete#Get(partial, opts) abort
   if !OmniSharp#IsServerRunning()
     return []
   endif
   if g:OmniSharp_server_stdio
     let s:complete_pending = 1
-    call s:StdioGetCompletions(a:partial, function('s:CBGet', [opts]))
-    if !has_key(opts, 'Callback')
+    call s:StdioGetCompletions(a:partial, a:opts, function('s:CBGet', [a:opts]))
+    if !has_key(a:opts, 'Callback')
       " No callback has been passed in, so this function should return
       " synchronously, so it can be used as an omnifunc
       let starttime = reltime()
@@ -27,7 +26,7 @@ function! OmniSharp#actions#complete#Get(partial, ...) abort
     let completions = OmniSharp#py#Eval(
     \ printf('getCompletions(%s)', string(a:partial)))
     if OmniSharp#py#CheckForError() | let completions = [] | endif
-    return s:CBGet(opts, completions)
+    return s:CBGet(a:opts, completions)
   endif
 endfunction
 
@@ -63,14 +62,16 @@ function! OmniSharp#actions#complete#ExpandSnippet() abort
 endfunction
 
 
-function! s:StdioGetCompletions(partial, Callback) abort
+function! s:StdioGetCompletions(partial, opts, Callback) abort
   let wantDocPopup = OmniSharp#popup#Enabled()
   \ && g:omnicomplete_fetch_full_documentation
   \ && &completeopt =~# 'popup'
   let wantDoc = wantDocPopup ? 'false'
   \ : g:omnicomplete_fetch_full_documentation ? 'true' : 'false'
   let wantSnippet = g:OmniSharp_want_snippet ? 'true' : 'false'
-  let s:last_startcol = col('.') - len(a:partial) - 1
+  let s:last_startcol = has_key(a:opts, 'startcol')
+  \ ? a:opts.startcol
+  \ : col('.') - len(a:partial) - 1
   let parameters = {
   \ 'WordToComplete': a:partial,
   \ 'WantDocumentationForEveryCompletionResult': wantDoc,

autoload/asyncomplete/sources/OmniSharp.vim

@@ -7,8 +7,12 @@ function! asyncomplete#sources#OmniSharp#completor(opt, ctx) abort
 
   let startcol = column - kwlen
 
-  call OmniSharp#actions#complete#Get(kw, {results->
-  \ asyncomplete#complete(a:opt['name'], a:ctx, startcol, results)})
+  let opts = {
+  \ 'startcol': startcol - 1,
+  \ 'Callback': {results->
+  \   asyncomplete#complete(a:opt['name'], a:ctx, startcol, results)}
+  \}
+  call OmniSharp#actions#complete#Get(kw, opts)
 endfunction
 
 " vim:et:sw=2:sts=2

autoload/coc/source/OmniSharp.vim

@@ -7,7 +7,8 @@ function! coc#source#OmniSharp#init() abort
 endfunction
 
 function! coc#source#OmniSharp#complete(options, callback) abort
-  call OmniSharp#actions#complete#Get(a:options.input, a:callback)
+  let opts = { 'Callback': a:callback }
+  call OmniSharp#actions#complete#Get(a:options.input, opts)
 endfunction
 
 " vim:et:sw=2:sts=2

autoload/deoplete/source/omnisharp.vim

@@ -12,5 +12,8 @@ endfunction
 function! deoplete#source#omnisharp#sendRequest(lhs, partial) abort
   let s:currentLhsRequest = a:lhs
   let g:deoplete#source#omnisharp#_results = v:null
-  call OmniSharp#actions#complete#Get(a:partial, {results -> s:onReceivedResponse(a:lhs, results)})
+  let opts = {
+  \ 'Callback': {results -> s:onReceivedResponse(a:lhs, results)}
+  \}
+  call OmniSharp#actions#complete#Get(a:partial, opts)
 endfunction

autoload/ncm2/sources/OmniSharp.vim

@@ -5,9 +5,10 @@ let s:loaded = 1
 
 function! ncm2#sources#OmniSharp#on_complete(ctx) abort
   let kw = matchstr(a:ctx['typed'], '\(\w*\W\)*\zs\w\+$')
-  call OmniSharp#actions#complete#Get(kw, {
-  \ results -> ncm2#complete(a:ctx, a:ctx['startccol'], results)
-  \})
+  let opts = {
+  \ 'Callback': {results -> ncm2#complete(a:ctx, a:ctx['startccol'], results)}
+  \}
+  call OmniSharp#actions#complete#Get(kw, opts)
 endfunction
 
 " vim:et:sw=2:sts=2

test/complete.vader

@@ -7,7 +7,8 @@ Given cs():
 Execute ():
   " Need to set a filename for OmniSharp-roslyn
   call OmniSharpTestInitializeBuffer('Complete')
-  call OmniSharpWarmup('OmniSharp#actions#complete#Get', ['usi'])
+  let opts = { 'startcol': 0 }
+  call OmniSharpWarmup('OmniSharp#actions#complete#Get', ['usi'], opts)
 
 Do (invoke omnicomplete on 'usi'):
   A\<c-x>\<c-o>