Skip to content

Commit

Permalink
Rename internal function names for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
nickspoons committed May 20, 2019
1 parent 812d705 commit 71374a7
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions ale_linters/cs/omnisharp.vim
@@ -1,5 +1,5 @@
if !get(g:, 'OmniSharp_loaded', 0) | finish | endif
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif

let s:delimiter = '@@@'

Expand All @@ -23,7 +23,7 @@ function! ale_linters#cs#omnisharp#ProcessOutput(buffer, lines) abort
endfunction

function! ale_linters#cs#omnisharp#GetCommand(bufnum) abort
let linter = OmniSharp#util#path_join(['python', 'ale_lint.py'])
let linter = OmniSharp#util#PathJoin(['python', 'ale_lint.py'])
let host = OmniSharp#GetHost(a:bufnum)
let cmd = printf(
\ '%%e %s --filename %%s --host %s --level %s --cwd %s --delimiter %s --encoding %s',
Expand Down
4 changes: 2 additions & 2 deletions autoload/OmniSharp.vim
@@ -1,4 +1,4 @@
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif

let s:save_cpo = &cpoptions
set cpoptions&vim
Expand Down Expand Up @@ -655,7 +655,7 @@ function! s:StartServer(sln_or_dir) abort
return
endif

let l:command = OmniSharp#util#get_start_cmd(a:sln_or_dir)
let l:command = OmniSharp#util#GetStartCmd(a:sln_or_dir)

if l:command ==# []
call OmniSharp#util#EchoErr('Could not determine the command to start the OmniSharp server!')
Expand Down
6 changes: 3 additions & 3 deletions autoload/OmniSharp/py.vim
Expand Up @@ -4,7 +4,7 @@ endif

let s:pycmd = has('python3') ? 'python3' : 'python'
let s:pyfile = has('python3') ? 'py3file' : 'pyfile'
let g:OmniSharp_python_path = OmniSharp#util#path_join(['python'])
let g:OmniSharp_python_path = OmniSharp#util#PathJoin(['python'])

let s:save_cpo = &cpoptions
set cpoptions&vim
Expand All @@ -22,15 +22,15 @@ endif

function! OmniSharp#py#load(filename)
call OmniSharp#py#bootstrap()
exec s:pyfile fnameescape(OmniSharp#util#path_join(['python', 'omnisharp', a:filename]))
exec s:pyfile fnameescape(OmniSharp#util#PathJoin(['python', 'omnisharp', a:filename]))
endfunction

function! OmniSharp#py#bootstrap()
if exists('s:bootstrap_complete')
return
endif
exec s:pycmd "sys.path.append(r'" . g:OmniSharp_python_path . "')"
exec s:pyfile fnameescape(OmniSharp#util#path_join(['python', 'bootstrap.py']))
exec s:pyfile fnameescape(OmniSharp#util#PathJoin(['python', 'bootstrap.py']))
let s:bootstrap_complete = 1
endfunction

Expand Down
6 changes: 3 additions & 3 deletions autoload/OmniSharp/util.vim
Expand Up @@ -17,7 +17,7 @@ function! s:is_wsl() abort
return strlen(system('grep Microsoft /proc/version')) > 0
endfunction

function! OmniSharp#util#check_capabilities(...) abort
function! OmniSharp#util#CheckCapabilities(...) abort
let verbose = a:0 > 0 && a:1 ==? 'verbose'

if g:OmniSharp_server_stdio
Expand Down Expand Up @@ -55,7 +55,7 @@ function! OmniSharp#util#EchoErr(msg)
echohl ErrorMsg | echomsg a:msg | echohl None
endfunction

function! OmniSharp#util#get_start_cmd(solution_file) abort
function! OmniSharp#util#GetStartCmd(solution_file) abort
let solution_path = a:solution_file
if fnamemodify(solution_path, ':t') ==? s:roslyn_server_files
let solution_path = fnamemodify(solution_path, ':h')
Expand Down Expand Up @@ -110,7 +110,7 @@ function! OmniSharp#util#get_start_cmd(solution_file) abort
return command
endfunction

function! OmniSharp#util#path_join(parts) abort
function! OmniSharp#util#PathJoin(parts) abort
if type(a:parts) == type('')
let parts = [a:parts]
elseif type(a:parts) == type([])
Expand Down
2 changes: 1 addition & 1 deletion autoload/ctrlp/OmniSharp/findcodeactions.vim
@@ -1,4 +1,4 @@
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif
if get(g:, 'loaded_ctrlp_OmniSharp_findcodeactions', 0) | finish | endif
let g:loaded_ctrlp_OmniSharp_findcodeactions = 1

Expand Down
2 changes: 1 addition & 1 deletion autoload/ctrlp/OmniSharp/findsymbols.vim
@@ -1,4 +1,4 @@
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif
if get(g:, 'loaded_ctrlp_OmniSharp_findsymbols', 0) | finish | endif
let g:loaded_ctrlp_OmniSharp_findsymbols = 1

Expand Down
2 changes: 1 addition & 1 deletion autoload/fzf/OmniSharp.vim
@@ -1,4 +1,4 @@
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif

let s:save_cpo = &cpoptions
set cpoptions&vim
Expand Down
2 changes: 1 addition & 1 deletion autoload/unite/sources/OmniSharp.vim
@@ -1,4 +1,4 @@
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif

let s:save_cpo = &cpoptions
set cpoptions&vim
Expand Down
2 changes: 1 addition & 1 deletion ftplugin/cs/OmniSharp.vim
@@ -1,5 +1,5 @@
if !get(g:, 'OmniSharp_loaded', 0) | finish | endif
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif
if get(b:, 'OmniSharp_ftplugin_loaded', 0) | finish | endif
let b:OmniSharp_ftplugin_loaded = 1

Expand Down
2 changes: 1 addition & 1 deletion plugin/OmniSharp.vim
Expand Up @@ -2,7 +2,7 @@ if exists('g:OmniSharp_loaded') | finish | endif
let g:OmniSharp_loaded = 1

let g:OmniSharp_server_stdio = get(g:, 'OmniSharp_server_stdio', 0)
if !OmniSharp#util#check_capabilities('verbose') | finish | endif
if !OmniSharp#util#CheckCapabilities('verbose') | finish | endif

" Use mono to start the roslyn server on *nix
let g:OmniSharp_server_use_mono = get(g:, 'OmniSharp_server_use_mono', 0)
Expand Down
2 changes: 1 addition & 1 deletion syntax_checkers/cs/codecheck.vim
@@ -1,5 +1,5 @@
if !get(g:, 'OmniSharp_loaded', 0) | finish | endif
if !OmniSharp#util#check_capabilities() | finish | endif
if !OmniSharp#util#CheckCapabilities() | finish | endif
if exists('g:loaded_syntastic_cs_code_checker') | finish | endif
let g:loaded_syntastic_cs_code_checker = 1

Expand Down
10 changes: 5 additions & 5 deletions test/run-omnisharp-async.vader
@@ -1,24 +1,24 @@
Execute (Test start command construction):
let project_path = OmniSharp#util#path_join(['omnisharp-roslyn', 'src', 'OmniSharp', 'project.json'])
let project_path = OmniSharp#util#PathJoin(['omnisharp-roslyn', 'src', 'OmniSharp', 'project.json'])
let g:OmniSharp_server_type = 'roslyn'
let command = OmniSharp#util#get_start_cmd(project_path)
let command = OmniSharp#util#GetStartCmd(project_path)
Assert command[0] =~ "artifacts.scripts.OmniSharp"

let g:OmniSharp_server_type = 'v1'
let command = OmniSharp#util#get_start_cmd(project_path)
let command = OmniSharp#util#GetStartCmd(project_path)
if !has('win32')
AssertEqual 'mono', command[0]
endif

" Execute (Test start omnisharp-v1 server):
" function! GetClassicCmd()
" let g:OmniSharp_server_type = 'v1'
" return OmniSharp#util#get_start_cmd(OmniSharp#util#path_join(['server', 'OmniSharp.sln']))
" return OmniSharp#util#GetStartCmd(OmniSharp#util#PathJoin(['server', 'OmniSharp.sln']))
" endfunction
"
" function! GetRoslynCmd()
" let g:OmniSharp_server_type = 'roslyn'
" return OmniSharp#util#get_start_cmd(OmniSharp#util#path_join(['omnisharp-roslyn', 'src', 'OmniSharp', 'project.json']))
" return OmniSharp#util#GetStartCmd(OmniSharp#util#PathJoin(['omnisharp-roslyn', 'src', 'OmniSharp', 'project.json']))
" endfunction
"
" let g:OmniSharp_proc_debug = 0
Expand Down

0 comments on commit 71374a7

Please sign in to comment.