add gobal setting dir (#330)

This commit is contained in:
Tsuyoshi CHO
2020-10-29 18:31:14 +09:00
committed by GitHub
parent d12ff45bd7
commit 91bf8fbdc2
2 changed files with 11 additions and 7 deletions

View File

@@ -17,10 +17,6 @@ call remove(s:settings, '$schema')
let s:ftmap = {}
function! lsp_settings#data_dir() abort
return s:data_dir
endfunction
function! lsp_settings#installer_dir() abort
return s:installer_dir
endfunction
@@ -33,6 +29,14 @@ function! lsp_settings#servers_dir() abort
return substitute(l:path, '[\/]$', '', '')
endfunction
function! lsp_settings#global_settings_dir() abort
let l:path = fnamemodify(get(g:, 'lsp_settings_global_settings_dir', s:data_dir), ':p')
if has('win32')
let l:path = substitute(l:path, '/', '\', 'g')
endif
return substitute(l:path, '[\/]$', '', '')
endfunction
function! lsp_settings#executable(cmd) abort
if executable(a:cmd)
return 1
@@ -377,8 +381,8 @@ function! s:vim_lsp_load_or_suggest(ft) abort
return
endif
if filereadable(s:data_dir . '/settings.json')
let l:settings = json_decode(join(readfile(s:data_dir . '/settings.json'), "\n"))
if filereadable(lsp_settings#global_settings_dir() . '/settings.json')
let l:settings = json_decode(join(readfile(lsp_settings#global_settings_dir() . '/settings.json'), "\n"))
if has_key(g:, 'lsp_settings')
call extend(g:lsp_settings, l:settings)
else

View File

@@ -20,7 +20,7 @@ function! lsp_settings#profile#load_local() abort
endfunction
function! lsp_settings#profile#edit_global() abort
let l:root = lsp_settings#data_dir()
let l:root = lsp_settings#global_settings_dir()
if !isdirectory(l:root)
call mkdir(l:root)
endif