Merge pull request #18 from thinca/use-option-variable-for-solargraph…

…-command Use g:monster#completion#solargraph#complete_command
osyo-manga · Mar 17, 2018 · cdd104c · cdd104c
2 parents 42bc833 + 18194f0
commit cdd104c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/autoload/monster/completion/solargraph.vim b/autoload/monster/completion/solargraph.vim
@@ -6,7 +6,7 @@ let g:monster#completion#solargraph#http_port = get(g:, "monster#completion#sola
 
 let g:monster#completion#solargraph#backend = get(g:, "monster#completion#solargraph#backend", "solargraph_suggest")
 
-let g:monster#completion#solargraph#complete_command = get(g:, "monster#completion#solargraph#complete_command", "solargraph")
+let g:monster#completion#solargraph#complete_command = get(g:, "monster#completion#solargraph#complete_command", "solargraph" . (has('win32') ? ".bat" : ""))
 
 function! s:item(value)
 	return {

diff --git a/autoload/monster/completion/solargraph/async_solargraph_suggest.vim b/autoload/monster/completion/solargraph/async_solargraph_suggest.vim
@@ -30,13 +30,13 @@ endfunction
 
 function! monster#completion#solargraph#async_solargraph_suggest#complete(context)
 	call monster#completion#solargraph#async_solargraph_suggest#cancel()
-	if !executable("solargraph")
+	if !executable(g:monster#completion#solargraph#complete_command)
 		call monster#errmsg("No executable 'solargraph' command.")
 		call monster#errmsg("Please install 'gem install solargraph'.")
 		return []
 	endif
 	if !exists('s:job') || job_status(s:job) != "run"
-		let command = "solargraph" . (has('win32') ? ".bat" : "")
+		let command = g:monster#completion#solargraph#complete_command
 		let args = [command, "server", "--port=".g:monster#completion#solargraph#http_port]
 		let s:job = job_start(args)
 		augroup MonsterSolargraph

diff --git a/autoload/monster/completion/solargraph/solargraph_suggest.vim b/autoload/monster/completion/solargraph/solargraph_suggest.vim
@@ -15,7 +15,7 @@ endfunction
 
 
 function! monster#completion#solargraph#solargraph_suggest#check()
-	return executable("solargraph") && executable("curl")
+	return executable(g:monster#completion#solargraph#complete_command) && executable("curl")
 endfunction
 
 
@@ -26,7 +26,7 @@ function! monster#completion#solargraph#solargraph_suggest#complete(context)
 		return
 	endif
 	if !exists('s:job') || job_status(s:job) != "run"
-		let command = "solargraph" . (has('win32') ? ".bat" : "")
+		let command = g:monster#completion#solargraph#complete_command
 		let args = [command, "server", "--port=".g:monster#completion#solargraph#http_port]
 		let s:job = job_start(args)
 		augroup MonsterSolargraph