aboutsummaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2020-01-25 00:04:46 +0900
committerGitHub <noreply@github.com>2020-01-25 00:04:46 +0900
commit46193cac27c6ae28f5e85cfb2cdedb2075a43209 (patch)
treeab0714def72a73bdb509d149625d1d86b1342588 /plugin
parentac91e517302380f0b5b50b06837789036d639ac8 (diff)
parent431fb236bfb6dd70b98c6c453a2dc48d780bcb74 (diff)
downloadvim-lsp-settings-46193cac27c6ae28f5e85cfb2cdedb2075a43209.tar.gz
vim-lsp-settings-46193cac27c6ae28f5e85cfb2cdedb2075a43209.tar.bz2
vim-lsp-settings-46193cac27c6ae28f5e85cfb2cdedb2075a43209.zip
Merge branch 'master' into efm
Diffstat (limited to 'plugin')
-rw-r--r--plugin/lsp_settings.vim6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim
index ffe10b0..3d4ee3d 100644
--- a/plugin/lsp_settings.vim
+++ b/plugin/lsp_settings.vim
@@ -17,6 +17,8 @@ let s:servers_dir = expand('<sfile>:h:h').'/servers'
let s:settings = json_decode(join(readfile(expand('<sfile>:h:h').'/settings.json'), "\n"))
let s:ftmap = {}
+call remove(s:settings, '$schema')
+
function! s:executable(cmd) abort
if executable(a:cmd)
return 1
@@ -133,7 +135,7 @@ function! s:vimlsp_settings_suggest(ft) abort
if exists(':LspInstallServer') !=# 2
redraw
echohl Directory
- echomsg 'If enable Language Server, please do :LspInstallServer'
+ echomsg 'Please do :LspInstallServer to enable Language Server'
echohl None
command! -buffer LspInstallServer call s:vimlsp_install_server(&l:filetype)
endif
@@ -186,7 +188,7 @@ function! s:vimlsp_suggest_plugin() abort
endif
redraw
echohl Directory
- echomsg printf('If enable Language Server, please install vim-plugin "%s"', l:server['vim-plugin']['name'])
+ echomsg printf('Please install vim-plugin "%s" to enable Language Server', l:server['vim-plugin']['name'])
echohl None
return
endfor