Simplify/organise variable initialisation

Author: nickspoons

autoload/OmniSharp/actions/complete.vim

@@ -69,10 +69,10 @@ endfunction
 
 function! s:StdioGetCompletions(partial, Callback) abort
   let wantDocPopup = OmniSharp#popup#Enabled()
-  \ && g:omnicomplete_fetch_full_documentation
+  \ && g:OmniSharp_complete_documentation
   \ && &completeopt =~# 'popup'
   let wantDoc = wantDocPopup ? 'false'
-  \ : g:omnicomplete_fetch_full_documentation ? 'true' : 'false'
+  \ : g:OmniSharp_complete_documentation ? 'true' : 'false'
   let wantSnippet = g:OmniSharp_want_snippet ? 'true' : 'false'
   let parameters = {
   \ 'WordToComplete': a:partial,
@@ -109,7 +109,7 @@ function! s:StdioGetCompletionsRH(Callback, wantDocPopup, response) abort
     \}
     if a:wantDocPopup
       let completion.info = cmp.MethodHeader . "\n ..."
-    elseif g:omnicomplete_fetch_full_documentation
+    elseif g:OmniSharp_complete_documentation
       let completion.info = ' '
       if has_key(cmp, 'Description') && cmp.Description != v:null
         let completion.info = cmp.Description

autoload/OmniSharp/util.vim

@@ -124,7 +124,7 @@ function! OmniSharp#util#CheckCapabilities() abort
 
   if !s:capable
     " Clear BufEnter and InsertLeave autocmds
-    silent! autocmd! OmniSharp_HighlightTypes
+    silent! autocmd! OmniSharp_Highlighting
     " Clear plugin integration autocmds
     silent! autocmd! OmniSharp_Integrations
   endif

doc/omnisharp-vim.txt

@@ -381,12 +381,13 @@ Window. Type lookups will display in the status line if this is `0`.
 Default: 0 >
     let g:OmniSharp_typeLookupInPreview = 0
 <
-                                        *g:omnicomplete_fetch_full_documentation*
+                                             *g:OmniSharp_complete_documentation*
 Use this option to specify whether OmniSharp will fetch full documentation on
-completion suggestions. By default, only type/method signatures are fetched for
-performance reasons. Full documentation can still be fetched when needed using
-the |:OmniSharpDocumentation| command. Default: 1 >
-    let g:omnicomplete_fetch_full_documentation = 1
+completion suggestions. When set to 0, only type/method signatures are fetched -
+full documentation can still be fetched when needed using the
+|:OmniSharpDocumentation| command.
+Default: 1 >
+    let g:OmniSharp_complete_documentation = 1
 <
 ===============================================================================
 4. COMMANDS                                                  *omnisharp-commands*

plugin/OmniSharp.vim

@@ -1,45 +1,28 @@
 if exists('g:OmniSharp_loaded') | finish | endif
 let g:OmniSharp_loaded = 1
 
-let g:OmniSharp_lookup_metadata = get(g:, 'OmniSharp_lookup_metadata', 1)
-
-" Default to `1`, except in cygwin defaults to `0`
-let g:OmniSharp_server_stdio = get(g:, 'OmniSharp_server_stdio', !has('win32unix'))
+let g:OmniSharp_server_stdio = get(g:, 'OmniSharp_server_stdio', !has('win32unix')) " Default to 1, except in cygwin
 
+" Server selection/initialization variables
+let g:OmniSharp_autoselect_existing_sln = get(g:, 'OmniSharp_autoselect_existing_sln', 0)
+let g:OmniSharp_prefer_global_sln = get(g:, 'OmniSharp_prefer_global_sln', 0)
 let g:OmniSharp_server_display_loading = get(g:, 'OmniSharp_server_display_loading', 1)
 let g:OmniSharp_server_loading_timeout = get(g:, 'OmniSharp_server_loading_timeout', 180)
-
-" Use mono to start the roslyn server on *nix
 let g:OmniSharp_server_use_mono = get(g:, 'OmniSharp_server_use_mono', 0)
-
-let g:OmniSharp_open_quickfix = get(g:, 'OmniSharp_open_quickfix', 1)
-
-let g:OmniSharp_timeout = get(g:, 'OmniSharp_timeout', 1)
-
-" Default to `0`, except in cygwin
-let g:OmniSharp_translate_cygwin_wsl = get(g:, 'OmniSharp_translate_cygwin_wsl', has('win32unix'))
-
-let g:OmniSharp_typeLookupInPreview = get(g:, 'OmniSharp_typeLookupInPreview', 0)
-
 let g:OmniSharp_sln_list_index = get(g:, 'OmniSharp_sln_list_index', -1)
-
-let g:OmniSharp_autoselect_existing_sln = get(g:, 'OmniSharp_autoselect_existing_sln', 0)
-let g:OmniSharp_prefer_global_sln = get(g:, 'OmniSharp_prefer_global_sln', 0)
+let g:OmniSharp_start_server = get(g:, 'OmniSharp_start_server', 1)
 let g:OmniSharp_start_without_solution = get(g:, 'OmniSharp_start_without_solution', 1)
 
-" Automatically start server
-let g:OmniSharp_start_server = get(g:, 'OmniSharp_start_server', get(g:, 'Omnisharp_start_server', 1))
-
-let defaultlevel = g:OmniSharp_server_stdio ? 'info' : 'warning'
-let g:OmniSharp_loglevel = get(g:, 'OmniSharp_loglevel', defaultlevel)
-
+let g:OmniSharp_complete_documentation = get(g:, 'OmniSharp_complete_documentation', get(g:, 'omnicomplete_fetch_full_documentation', 1))
+let g:OmniSharp_loglevel = get(g:, 'OmniSharp_loglevel', g:OmniSharp_server_stdio ? 'info' : 'warning')
+let g:OmniSharp_lookup_metadata = get(g:, 'OmniSharp_lookup_metadata', 1)
+let g:OmniSharp_open_quickfix = get(g:, 'OmniSharp_open_quickfix', 1)
 let g:OmniSharp_runtests_parallel = get(g:, 'OmniSharp_runtests_parallel', 1)
 let g:OmniSharp_runtests_echo_output = get(g:, 'OmniSharp_runtests_echo_output', 1)
-
-" Set to 1 when ultisnips is installed
-let g:OmniSharp_want_snippet = get(g:, 'OmniSharp_want_snippet', 0)
-
-let g:omnicomplete_fetch_full_documentation = get(g:, 'omnicomplete_fetch_full_documentation', 1)
+let g:OmniSharp_timeout = get(g:, 'OmniSharp_timeout', 1)
+let g:OmniSharp_translate_cygwin_wsl = get(g:, 'OmniSharp_translate_cygwin_wsl', has('win32unix')) " Default to 0, except in cygwin
+let g:OmniSharp_typeLookupInPreview = get(g:, 'OmniSharp_typeLookupInPreview', 0)
+let g:OmniSharp_want_snippet = get(g:, 'OmniSharp_want_snippet', 0) " Set to 1 when ultisnips is installed
 
 command! -bar -nargs=? OmniSharpInstall call OmniSharp#Install(<f-args>)
 command! -bar -nargs=? OmniSharpOpenLog call OmniSharp#log#Open(<q-args>)
@@ -48,7 +31,7 @@ command! -bar -nargs=? OmniSharpOpenLog call OmniSharp#log#Open(<q-args>)
 " Preserve backwards compatibility with older version g:OmniSharp_highlight_types
 let g:OmniSharp_highlighting = get(g:, 'OmniSharp_highlighting', get(g:, 'OmniSharp_highlight_types', 2))
 if g:OmniSharp_highlighting
-  augroup OmniSharp_HighlightTypes
+  augroup OmniSharp_Highlighting
     autocmd!
     autocmd BufEnter *.cs,*.csx
     \ if !pumvisible() && OmniSharp#util#CheckCapabilities() |

python/omnisharp/commands.py

@@ -61,7 +61,7 @@ def getCompletions(partialWord):
     parameters['WordToComplete'] = partialWord
 
     parameters['WantDocumentationForEveryCompletionResult'] = \
-        bool(int(vim.eval('g:omnicomplete_fetch_full_documentation')))
+        bool(int(vim.eval('g:OmniSharp_complete_documentation')))
 
     want_snippet = \
         bool(int(vim.eval('g:OmniSharp_want_snippet')))