diff options
| -rw-r--r-- | plugin/lsp_setup.vim | 14 | ||||
| -rw-r--r-- | settings.json (renamed from setting.json) | 0 | ||||
| -rw-r--r-- | settings/clangd.vim (renamed from setting/clangd.vim) | 0 | ||||
| -rw-r--r-- | settings/eclipse-jdt-ls.vim (renamed from setting/eclipse-jdt-ls.vim) | 0 | ||||
| -rw-r--r-- | settings/emmylua-ls.vim (renamed from setting/emmylua-ls.vim) | 0 | ||||
| -rw-r--r-- | settings/gopls.vim (renamed from setting/gopls.vim) | 0 | ||||
| -rw-r--r-- | settings/intelephense-server.vim (renamed from setting/intelephense-server.vim) | 0 | ||||
| -rw-r--r-- | settings/kotlin-language-server.vim (renamed from setting/kotlin-language-server.vim) | 0 | ||||
| -rw-r--r-- | settings/pyls.vim (renamed from setting/pyls.vim) | 0 | ||||
| -rw-r--r-- | settings/rls.vim (renamed from setting/rls.vim) | 0 | ||||
| -rw-r--r-- | settings/solargraph.vim (renamed from setting/solargraph.vim) | 0 | ||||
| -rw-r--r-- | settings/typescript-language-server.vim (renamed from setting/typescript-language-server.vim) | 0 | ||||
| -rw-r--r-- | settings/vim-language-server.vim (renamed from setting/vim-language-server.vim) | 0 |
13 files changed, 7 insertions, 7 deletions
diff --git a/plugin/lsp_setup.vim b/plugin/lsp_setup.vim index 24e792d..3bfcaa4 100644 --- a/plugin/lsp_setup.vim +++ b/plugin/lsp_setup.vim @@ -1,6 +1,6 @@ -let s:setting_dir = expand('<sfile>:h:h').'/setting' +let s:settings_dir = expand('<sfile>:h:h').'/settings' let s:installer_dir = expand('<sfile>:h:h').'/installer' -let s:setting = json_decode(join(readfile(expand('<sfile>:h:h').'/setting.json'), "\n")) +let s:settings = json_decode(join(readfile(expand('<sfile>:h:h').'/settings.json'), "\n")) function! s:executable(cmd) abort if executable(a:cmd) @@ -26,7 +26,7 @@ function! s:executable(cmd) abort endfunction function! s:vimlsp_installer() abort - let l:setting = s:setting[&filetype] + let l:setting = s:settings[&filetype] if empty(l:setting) return '' endif @@ -73,14 +73,14 @@ function! s:vimlsp_settings_suggest() abort endfunction function! s:vimlsp_setting() abort - for l:ft in keys(s:setting) + for l:ft in keys(s:settings) let l:found = 0 - if empty(s:setting[l:ft]) + if empty(s:settings[l:ft]) continue endif - for l:server in s:setting[l:ft] + for l:server in s:settings[l:ft] if s:executable(l:server.command) - exe 'source' printf('%s/%s.vim', s:setting_dir, l:server.command) + exe 'source' printf('%s/%s.vim', s:settings_dir, l:server.command) let l:found += 1 break endif diff --git a/setting.json b/settings.json index 59cdf8c..59cdf8c 100644 --- a/setting.json +++ b/settings.json diff --git a/setting/clangd.vim b/settings/clangd.vim index 4c9ba11..4c9ba11 100644 --- a/setting/clangd.vim +++ b/settings/clangd.vim diff --git a/setting/eclipse-jdt-ls.vim b/settings/eclipse-jdt-ls.vim index 5a6221b..5a6221b 100644 --- a/setting/eclipse-jdt-ls.vim +++ b/settings/eclipse-jdt-ls.vim diff --git a/setting/emmylua-ls.vim b/settings/emmylua-ls.vim index 08f94ac..08f94ac 100644 --- a/setting/emmylua-ls.vim +++ b/settings/emmylua-ls.vim diff --git a/setting/gopls.vim b/settings/gopls.vim index c5fcc88..c5fcc88 100644 --- a/setting/gopls.vim +++ b/settings/gopls.vim diff --git a/setting/intelephense-server.vim b/settings/intelephense-server.vim index ef10860..ef10860 100644 --- a/setting/intelephense-server.vim +++ b/settings/intelephense-server.vim diff --git a/setting/kotlin-language-server.vim b/settings/kotlin-language-server.vim index ebc2c94..ebc2c94 100644 --- a/setting/kotlin-language-server.vim +++ b/settings/kotlin-language-server.vim diff --git a/setting/pyls.vim b/settings/pyls.vim index 177a429..177a429 100644 --- a/setting/pyls.vim +++ b/settings/pyls.vim diff --git a/setting/rls.vim b/settings/rls.vim index 4267795..4267795 100644 --- a/setting/rls.vim +++ b/settings/rls.vim diff --git a/setting/solargraph.vim b/settings/solargraph.vim index f86be72..f86be72 100644 --- a/setting/solargraph.vim +++ b/settings/solargraph.vim diff --git a/setting/typescript-language-server.vim b/settings/typescript-language-server.vim index ab7009d..ab7009d 100644 --- a/setting/typescript-language-server.vim +++ b/settings/typescript-language-server.vim diff --git a/setting/vim-language-server.vim b/settings/vim-language-server.vim index 6932aa9..6932aa9 100644 --- a/setting/vim-language-server.vim +++ b/settings/vim-language-server.vim |