diff options
author | Tsuyoshi CHO <Tsuyoshi.CHO@Gmail.com> | 2019-12-29 11:00:54 +0900 |
---|---|---|
committer | Tsuyoshi CHO <Tsuyoshi.CHO@Gmail.com> | 2019-12-29 11:00:54 +0900 |
commit | a0865ce2089cfb3248d850e0d24a26855f03da6b (patch) | |
tree | d6d8885bca8f1dc2a3d9628cddd385b461f3ea05 /plugin | |
parent | 45a0aa937fda907dcf2ce52362b8a69ea3a2fa62 (diff) | |
parent | 38c4e67140ee3e37c8c06765e111d00e2d1211dd (diff) | |
download | vim-lsp-settings-a0865ce2089cfb3248d850e0d24a26855f03da6b.tar.gz vim-lsp-settings-a0865ce2089cfb3248d850e0d24a26855f03da6b.tar.bz2 vim-lsp-settings-a0865ce2089cfb3248d850e0d24a26855f03da6b.zip |
Merge branch 'master' into fix/windows-native-py3
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/lsp_settings.vim | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim index 412b6f3..51aae02 100644 --- a/plugin/lsp_settings.vim +++ b/plugin/lsp_settings.vim @@ -33,10 +33,11 @@ function! s:executable(cmd) abort endfunction function! s:vimlsp_installer() abort - if !has_key(s:settings, &filetype) + let l:ft = split(&filetype, '\.')[0] + if !has_key(s:settings, l:ft) return [] endif - let l:server = s:settings[&filetype] + let l:server = s:settings[l:ft] if empty(l:server) return [] endif @@ -108,7 +109,10 @@ function! s:vimlsp_settings_suggest() abort return endif if !exists(':LspInstallServer') + redraw + echohl Directory echomsg 'If you want to enable Language Server, please do :LspInstallServer' + echohl None command! -buffer LspInstallServer call s:vimlsp_install_server() endif endfunction @@ -180,7 +184,9 @@ function! s:vimlsp_load_or_suggest(ft) abort endif endif - delcommand LspRegisterServer + if !exists(':LspRegisterServer') + delcommand LspRegisterServer + endif endfunction function! s:load_or_suggest_group_name(ft) abort |