diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-02-20 00:18:27 +0900 |
|---|---|---|
| committer | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-02-20 00:18:27 +0900 |
| commit | 0e71903b66fdf01d0386ba1b653174dfcec7f21c (patch) | |
| tree | ae9f1f38e8b902a5cfe6cd09692025d77d03fce8 | |
| parent | e55fa57320b284eb38392a5e57b2edee27d966a5 (diff) | |
| download | vim-lsp-settings-0e71903b66fdf01d0386ba1b653174dfcec7f21c.tar.gz vim-lsp-settings-0e71903b66fdf01d0386ba1b653174dfcec7f21c.tar.bz2 vim-lsp-settings-0e71903b66fdf01d0386ba1b653174dfcec7f21c.zip | |
Fix root_uri_patterns
| -rw-r--r-- | autoload/lsp_settings.vim | 6 | ||||
| -rw-r--r-- | local-schema.json | 15 | ||||
| -rw-r--r-- | schema.json | 11 |
3 files changed, 25 insertions, 7 deletions
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index 9183069..fc6282b 100644 --- a/autoload/lsp_settings.vim +++ b/autoload/lsp_settings.vim @@ -345,15 +345,15 @@ function! s:vim_lsp_suggest_plugin() abort let l:ext = expand('%:e') for l:ft in keys(s:settings) for l:server in s:settings[l:ft] - if !has_key(l:server, 'vim-plugin') + if !has_key(l:server, 'vim_plugin') continue endif - if index(l:server['vim-plugin']['extensions'], l:ext) == -1 + if index(l:server['vim_plugin']['extensions'], l:ext) == -1 continue endif redraw echohl Directory - echomsg printf('Please install vim-plugin "%s" to enable Language Server', 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 diff --git a/local-schema.json b/local-schema.json index 694a97f..bf49ddd 100644 --- a/local-schema.json +++ b/local-schema.json @@ -4,7 +4,6 @@ "patternProperties": { "^([a-z0-9_-]+)+$": { "description": "define name of language server", - "type": "object", "properties": { "blacklist": { "items": { @@ -26,8 +25,8 @@ "type": "object" }, "disabled": { - "description": "set true if you want to enable server", "default": true, + "description": "set true if you want to enable server", "type": "boolean" }, "initialization_options": { @@ -39,6 +38,15 @@ "pattern": "^file://\\S+$", "type": "string" }, + "root_uri_patterns": { + "default": [], + "description": "define patterns with file or directory names for finding root_uri", + "items": { + "description": "file or directory name", + "type": "string" + }, + "type": "array" + }, "whitelist": { "items": { "description": "define name of whitelisted language server", @@ -50,7 +58,8 @@ "workspace_config": { "type": "object" } - } + }, + "type": "object" } }, "title": "vim-lsp-settings-local", diff --git a/schema.json b/schema.json index ab23b42..fa36bac 100644 --- a/schema.json +++ b/schema.json @@ -32,7 +32,16 @@ }, "type": "array" }, - "vim-plugin": { + "root_uri_patterns": { + "default": [], + "description": "define patterns with file or directory names for finding root_uri", + "items": { + "description": "file or directory name", + "type": "string" + }, + "type": "array" + }, + "vim_plugin": { "additionalProperties": false, "default": {}, "description": "define suggestion for vim-plugin", |