From c7b8916b10cc63ce40652e905e69c6cc8ab72a08 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Thu, 13 Feb 2020 19:13:53 +0900
Subject: Remove typed_pattern
---
autoload/lsp_settings.vim | 1 +
settings.json | 1 +
settings/css-languageserver.vim | 2 +-
settings/html-languageserver.vim | 2 +-
settings/powershell-languageserver.vim | 2 +-
settings/solargraph.vim | 2 +-
6 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim
index 1e10a9d..9c83760 100644
--- a/autoload/lsp_settings.vim
+++ b/autoload/lsp_settings.vim
@@ -352,6 +352,7 @@ function! s:vim_lsp_load_or_suggest(ft) abort
let l:refresh_pattern = get(l:server, 'refresh_pattern', '')
if !empty(l:refresh_pattern)
let b:asyncomplete_refresh_pattern = l:refresh_pattern
+ let b:vim_lsp_refresh_pattern = l:refresh_pattern
endif
endfor
endif
diff --git a/settings.json b/settings.json
index c62470e..769c79d 100644
--- a/settings.json
+++ b/settings.json
@@ -210,6 +210,7 @@
],
"html": [
{
+ "refresh_pattern": "\\(/\\|k\\+\\)$",
"command": "html-languageserver",
"requires": [
"npm"
diff --git a/settings/css-languageserver.vim b/settings/css-languageserver.vim
index de414c2..3e4dc4f 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-]\+$'}),
+ \ 'config': lsp_settings#get('css-languageserver', 'config', {}),
\ '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 edecd24..7855505 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', {'typed_pattern': '\(/\|k\+\)$'}),
+ \ 'config': lsp_settings#get('html-languageserver', 'config', {}),
\ 'workspace_config': lsp_settings#get('html-languageserver', 'workspace_config', {}),
\ }
augroup END
diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim
index 105cd19..17912a5 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('solargraph', 'config', {'typed_pattern': '\(\$[a-zA-Z0-9_:]*\|\k\+\)$'}),
+ \ 'config': lsp_settings#get('solargraph', 'config', {}),
\ 'workspace_config': lsp_settings#get('powershell-languageserver', 'workspace_config', {}),
\ }
augroup END
diff --git a/settings/solargraph.vim b/settings/solargraph.vim
index 3b723ee..aa52329 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', {'typed_pattern': '\([$@]\k*\|\k\+\)$'}),
+ \ 'config': lsp_settings#get('solargraph', 'config', {}),
\ 'workspace_config': lsp_settings#get('solargraph', 'workspace_config', {}),
\ }
augroup END
--
cgit v1.2.3-54-g00ecf