aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuhiro Matsumoto <mattn.jp@gmail.com>2020-01-24 21:41:55 +0900
committerYasuhiro Matsumoto <mattn.jp@gmail.com>2020-01-24 21:41:55 +0900
commitb04982423e4bada1c0fa51393a07d30257fa8ca9 (patch)
tree7c92cda6a3f49a7baf9489941d745ee211e8ac8b
parent90239e88b5dc40479403fc322d03fe1926809f94 (diff)
downloadvim-lsp-settings-b04982423e4bada1c0fa51393a07d30257fa8ca9.tar.gz
vim-lsp-settings-b04982423e4bada1c0fa51393a07d30257fa8ca9.tar.bz2
vim-lsp-settings-b04982423e4bada1c0fa51393a07d30257fa8ca9.zip
Support jsonc
-rw-r--r--settings.json54
-rw-r--r--settings/json-languageserver.vim2
2 files changed, 35 insertions, 21 deletions
diff --git a/settings.json b/settings.json
index a4d781f..a81206c 100644
--- a/settings.json
+++ b/settings.json
@@ -206,6 +206,20 @@
]
}
],
+ "jsonc": [
+ {
+ "command": "json-languageserver",
+ "requires": [
+ "npm"
+ ],
+ "vim-plugin": {
+ "extensions": [
+ "cjson"
+ ],
+ "name": "neoclide/jsonc.vim"
+ }
+ }
+ ],
"kotlin": [
{
"command": "kotlin-language-server",
@@ -256,6 +270,26 @@
}
}
],
+ "perl": [
+ {
+ "command": "slp",
+ "requires": [
+ "cpanm"
+ ]
+ },
+ {
+ "command": "monastery",
+ "requires": [
+ "cpanm"
+ ]
+ },
+ {
+ "command": "perl-languageserver",
+ "requires": [
+ "cpanm"
+ ]
+ }
+ ],
"php": [
{
"command": "intelephense",
@@ -426,26 +460,6 @@
]
}
],
- "perl": [
- {
- "command": "slp",
- "requires": [
- "cpanm"
- ]
- },
- {
- "command": "monastery",
- "requires": [
- "cpanm"
- ]
- },
- {
- "command": "perl-languageserver",
- "requires": [
- "cpanm"
- ]
- }
- ],
"yaml": [
{
"command": "yaml-language-server",
diff --git a/settings/json-languageserver.vim b/settings/json-languageserver.vim
index d7e79ca..a19b3b6 100644
--- a/settings/json-languageserver.vim
+++ b/settings/json-languageserver.vim
@@ -5,7 +5,7 @@ augroup vimlsp_settings_json_languageserver
\ 'cmd': {server_info->lsp_settings#get('json-languageserver', 'cmd', [lsp_settings#exec_path('json-languageserver'), '--stdio'])},
\ 'root_uri':{server_info->lsp_settings#get('json-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
\ 'initialization_options': lsp_settings#get('json-languageserver', 'initialization_options', v:null),
- \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json']),
+ \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json', 'jsonc']),
\ 'blacklist': lsp_settings#get('json-languageserver', 'blacklist', []),
\ 'config': lsp_settings#get('json-languageserver', 'config', {}),
\ 'workspace_config': lsp_settings#get('json-languageserver', 'workspace_config', {name, key->{'json': {'format': {'enable': v:true}, 'schemas': json_decode(join(readfile(expand('<sfile>:h:h') . '/data/catalog.json'), "\n"))['schemas']}}}),