Pass bufnr to g:OmniSharp_find_solution()

Author: nickspoons

autoload/OmniSharp.vim

@@ -108,16 +108,16 @@ function! OmniSharp#FindSolutionOrDir(...) abort
   let interactive = a:0 ? a:1 : 1
   let bufnr = a:0 > 1 ? a:2 : bufnr('%')
   if empty(getbufvar(bufnr, 'OmniSharp_buf_server'))
-    try
-      if g:OmniSharp_sln_resolve_function != v:null
-        let sln = call(g:OmniSharp_sln_resolve_function, [])
-      else
+    if exists('g:OmniSharp_find_solution')
+      let sln = call(g:OmniSharp_find_solution, [bufnr])
+    else
+      try
         let sln = s:FindSolution(interactive, bufnr)
-      endif
-      call setbufvar(bufnr, 'OmniSharp_buf_server', sln)
-    catch
-      return ''
-    endtry
+      catch
+        return ''
+      endtry
+    endif
+    call setbufvar(bufnr, 'OmniSharp_buf_server', sln)
   endif
   return getbufvar(bufnr, 'OmniSharp_buf_server')
 endfunction

doc/omnisharp-vim.txt

@@ -190,18 +190,16 @@ Default: {} >
     \ 'C:\path\to\other\project': 2004,
     \}
 <
-                                                       *g:OmniSharp_sln_resolve_function*
+                                                      *g:OmniSharp_find_solution*
 Function used to resolve the solution file anytime it needs to be resolved
 based on the currently opened file.
 
 This can be used in various ways, but one particular use case might be when
 you need Omnisharp to stick to a given solution file that would contain all
 the projects that you need to work with even though you navigate to
 subprojects where other solution files could be found there. In that case, one
-could pass a value along the following lines:
-
->
-    let g:OmniSharp_sln_resolve_function = { -> "/the/path/to/my/main_project.sln" }
+could pass a value along the following lines: >
+    let g:OmniSharp_find_solution = {bufnr -> "/path/to/main_project.sln"}
 <
 
 This is a lambda expression that always evaluates to the string

plugin/OmniSharp.vim

@@ -52,8 +52,6 @@ let g:OmniSharp_coc_snippet = get(g:, 'OmniSharp_coc_snippet', 0)
 
 let g:omnicomplete_fetch_full_documentation = get(g:, 'omnicomplete_fetch_full_documentation', 1)
 
-let g:OmniSharp_sln_resolve_function = get(g:, 'OmniSharp_sln_resolve_function',  v:null)
-
 command! -bar -nargs=? OmniSharpInstall call OmniSharp#Install(<f-args>)
 command! -bar -nargs=? OmniSharpOpenLog call OmniSharp#log#Open(<q-args>)
 command! -bar -bang OmniSharpStatus call OmniSharp#Status(<bang>0)