aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuhiro Matsumoto <mattn.jp@gmail.com>2020-02-16 21:46:19 +0900
committerYasuhiro Matsumoto <mattn.jp@gmail.com>2020-02-16 21:46:19 +0900
commitbde44e12e6669377b86e3c70f429ebad1c8840ce (patch)
tree5a7d79562d4e43df85a36fa48d96b6126130317b
parent8d161f8ca245e6838e58b0039181ff02c94c2cb4 (diff)
parent4ebd9f9637ee387d85b1b943ef734d0fdf05841c (diff)
downloadvim-lsp-settings-bde44e12e6669377b86e3c70f429ebad1c8840ce.tar.gz
vim-lsp-settings-bde44e12e6669377b86e3c70f429ebad1c8840ce.tar.bz2
vim-lsp-settings-bde44e12e6669377b86e3c70f429ebad1c8840ce.zip
Merge branch 'master' of git://github.com/mattn/vim-lsp-settings
-rw-r--r--README.md2
-rw-r--r--settings/gopls.vim2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index ee3d88c..8dae690 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ Or put `.vim-lsp-settings/settings.json` on your project root directory.
}
```
-To edit project local `esttings.json`, do `:LspSettingsLocalEdit`.
+To edit project local `settings.json`, do `:LspSettingsLocalEdit`.
Overridable keys are:
diff --git a/settings/gopls.vim b/settings/gopls.vim
index 87bbd9d..ef16622 100644
--- a/settings/gopls.vim
+++ b/settings/gopls.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_gopls
LspRegisterServer {
\ 'name': 'gopls',
\ 'cmd': {server_info->lsp_settings#get('gopls', 'cmd', [lsp_settings#exec_path('gopls')])},
- \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri(extend(['go.mod'], )))},
+ \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri(['go.mod']))},
\ 'initialization_options': lsp_settings#get('gopls', 'initialization_options', {"diagnostics": v:true, 'completeUnimported': v:true, 'matcher': 'fuzzy'}),
\ 'whitelist': lsp_settings#get('gopls', 'whitelist', ['go']),
\ 'blacklist': lsp_settings#get('gopls', 'blacklist', []),