diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-02-05 23:13:02 +0900 |
|---|---|---|
| committer | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-02-05 23:13:02 +0900 |
| commit | 5a9a1bdc182e8c5ade75bc91ec112d105abb37c7 (patch) | |
| tree | fd89e2395ad7403019c7227309fa1ebcad539f00 /settings | |
| parent | 3e4d8bf5c5fff96ae42b1f2a72aaf236e7db1eb9 (diff) | |
| parent | c727df7bcaa13202f81fb513ea61d6a75d634b84 (diff) | |
| download | vim-lsp-settings-5a9a1bdc182e8c5ade75bc91ec112d105abb37c7.tar.gz vim-lsp-settings-5a9a1bdc182e8c5ade75bc91ec112d105abb37c7.tar.bz2 vim-lsp-settings-5a9a1bdc182e8c5ade75bc91ec112d105abb37c7.zip | |
Merge branch 'master' into glsllsglslls
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css-languageserver.vim | 2 | ||||
| -rw-r--r-- | settings/html-languageserver.vim | 2 | ||||
| -rw-r--r-- | settings/metals.vim | 2 | ||||
| -rw-r--r-- | settings/powershell-languageserver.vim | 2 | ||||
| -rw-r--r-- | settings/solargraph.vim | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/settings/css-languageserver.vim b/settings/css-languageserver.vim index b3d33a4..de414c2 100644 --- a/settings/css-languageserver.vim +++ b/settings/css-languageserver.vim @@ -7,7 +7,7 @@ augroup vimlsp_settings_css_languageserver \ 'initialization_options': lsp_settings#get('css-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('css-languageserver', 'whitelist', ['css', 'less', 'sass']), \ 'blacklist': lsp_settings#get('css-languageserver', 'blacklist', []), - \ 'config': lsp_settings#get('css-languageserver', 'config', {'typed_pattern': '-\?[a-zA-Z_]\+[_a-zA-Z0-9-]*$\|\k\+$'}), + \ 'config': lsp_settings#get('css-languageserver', 'config', {'typed_pattern': '-\?[a-zA-Z_]\+[_a-zA-Z0-9-]\+$'}), \ 'workspace_config': lsp_settings#get('css-languageserver', 'workspace_config', { \ 'css': {'lint': {'validProperties': []}}, \ 'less': {'lint': {'validProperties': []}}, diff --git a/settings/html-languageserver.vim b/settings/html-languageserver.vim index 7855505..edecd24 100644 --- a/settings/html-languageserver.vim +++ b/settings/html-languageserver.vim @@ -7,7 +7,7 @@ augroup vimlsp_settings_html_languageserver \ 'initialization_options': lsp_settings#get('html-languageserver', 'initialization_options', {'embeddedLanguages': {'css': v:true, 'javascript': v:true}}), \ 'whitelist': lsp_settings#get('html-languageserver', 'whitelist', ['html']), \ 'blacklist': lsp_settings#get('html-languageserver', 'blacklist', []), - \ 'config': lsp_settings#get('html-languageserver', 'config', {}), + \ 'config': lsp_settings#get('html-languageserver', 'config', {'typed_pattern': '\(/\|k\+\)$'}), \ 'workspace_config': lsp_settings#get('html-languageserver', 'workspace_config', {}), \ } augroup END diff --git a/settings/metals.vim b/settings/metals.vim index 376d5f5..d0cdd53 100644 --- a/settings/metals.vim +++ b/settings/metals.vim @@ -7,7 +7,7 @@ augroup vimlsp_settings_metals \ 'initialization_options': lsp_settings#get('metals', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('metals', 'whitelist', ['scala', 'sbt']), \ 'blacklist': lsp_settings#get('metals', 'blacklist', []), - \ 'config': lsp_settings#get('metals', 'config', {}), + \ 'config': lsp_settings#get('metals', 'config', {'typed_pattern': '\k\zs'}), \ 'workspace_config': lsp_settings#get('metals', 'workspace_config', {}), \ } augroup END diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim index 380a7ba..105cd19 100644 --- a/settings/powershell-languageserver.vim +++ b/settings/powershell-languageserver.vim @@ -7,7 +7,7 @@ augroup vimlsp_settings_powershell_languageserver \ 'initialization_options': lsp_settings#get('powershell-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('powershell-languageserver', 'whitelist', ['ps1']), \ 'blacklist': lsp_settings#get('powershell-languageserver', 'blacklist', []), - \ 'config': lsp_settings#get('powershell-languageserver', 'config', {}), + \ 'config': lsp_settings#get('solargraph', 'config', {'typed_pattern': '\(\$[a-zA-Z0-9_:]*\|\k\+\)$'}), \ 'workspace_config': lsp_settings#get('powershell-languageserver', 'workspace_config', {}), \ } augroup END diff --git a/settings/solargraph.vim b/settings/solargraph.vim index 9373975..3fc17e8 100644 --- a/settings/solargraph.vim +++ b/settings/solargraph.vim @@ -7,7 +7,7 @@ augroup vimlsp_settings_solargraph \ 'initialization_options': lsp_settings#get('solargraph', 'initialization_options', {"diagnostics": "true"}), \ 'whitelist': lsp_settings#get('solargraph', 'whitelist', ['ruby']), \ 'blacklist': lsp_settings#get('solargraph', 'blacklist', []), - \ 'config': lsp_settings#get('solargraph', 'config', {}), + \ 'config': lsp_settings#get('solargraph', 'config', {'typed_pattern': '\([$@]\k*\|\k\+\)$'}), \ 'workspace_config': lsp_settings#get('solargraph', 'workspace_config', {}), \ } augroup END |