From 90b4c2e84a6a3b65071cf740c6ed060dbbd24719 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Wed, 5 Feb 2020 18:26:19 +0900 Subject: Rename asyncomplete-refresh-pattern to refresh_pattern --- autoload/lsp_settings.vim | 6 +++--- schema.json | 4 ++-- settings.json | 7 ++++--- settings/html-languageserver.vim | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index e0160de..fcbcc98 100644 --- a/autoload/lsp_settings.vim +++ b/autoload/lsp_settings.vim @@ -331,9 +331,9 @@ function! s:vim_lsp_load_or_suggest(ft) abort if get(g:, 'lsp_loaded', 0) for l:server in s:settings[a:ft] - let l:pattern = get(l:server, 'asyncomplete-refresh-pattern', '') - if !empty(l:pattern) - let b:asyncomplete_refresh_pattern = l:pattern + let l:refresh_pattern = get(l:server, 'refresh_pattern', '') + if !empty(l:refresh_pattern) + let b:asyncomplete_refresh_pattern = l:refresh_pattern endif endfor endif diff --git a/schema.json b/schema.json index 38c11d6..95cd0f7 100644 --- a/schema.json +++ b/schema.json @@ -8,8 +8,8 @@ "additionalProperties": false, "description": "define command description", "properties": { - "asyncomplete-refresh-pattern": { - "description": "define refresh pattern for asyncomplete", + "refresh_pattern": { + "description": "loop left and find the start of the word or trigger chars and set it as the startcol for the source instead of refresh_pattern", "type": "string" }, "command": { diff --git a/settings.json b/settings.json index d6fe430..5bc7c4d 100644 --- a/settings.json +++ b/settings.json @@ -63,7 +63,7 @@ ], "css": [ { - "asyncomplete-refresh-pattern": "\\(-\\?[a-zA-Z_]\\+[_a-zA-Z0-9-]*$\\|\\k\\+$\\)", + "refresh_pattern": "\\(-\\?[a-zA-Z_]\\+[_a-zA-Z0-9-]*$\\|\\k\\+$\\)", "command": "css-languageserver", "requires": [ "npm" @@ -189,6 +189,7 @@ ], "html": [ { + "refresh_pattern": "\\(\\k\\+\\)$", "command": "html-languageserver", "requires": [ "npm" @@ -345,7 +346,7 @@ ], "ps1": [ { - "asyncomplete-refresh-pattern": "\\(\\$\\k*$\\|\\k\\+$\\)", + "refresh_pattern": "\\(\\$\\k*$\\|\\k\\+$\\)", "command": "powershell-languageserver", "requires": [ "pwsh" @@ -401,7 +402,7 @@ ], "ruby": [ { - "asyncomplete-refresh-pattern": "\\(\\$\\k*$\\|\\k\\+$\\)", + "refresh_pattern": "\\(\\$\\k*$\\|\\k\\+$\\)", "command": "solargraph", "requires": [ "gem" diff --git a/settings/html-languageserver.vim b/settings/html-languageserver.vim index 7855505..3cbd485 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 -- cgit v1.2.3-54-g00ecf From 68a59e6d340e1db9dca52774c8d3aea96ffce73e Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Wed, 5 Feb 2020 18:48:43 +0900 Subject: Fixes refresh_pattern and typed_pattern. --- settings.json | 7 +++---- settings/css-languageserver.vim | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/settings.json b/settings.json index 5bc7c4d..3aea50c 100644 --- a/settings.json +++ b/settings.json @@ -63,7 +63,7 @@ ], "css": [ { - "refresh_pattern": "\\(-\\?[a-zA-Z_]\\+[_a-zA-Z0-9-]*$\\|\\k\\+$\\)", + "refresh_pattern": "\\([a-zA-Z0-9_-]\\+\\)$", "command": "css-languageserver", "requires": [ "npm" @@ -189,7 +189,6 @@ ], "html": [ { - "refresh_pattern": "\\(\\k\\+\\)$", "command": "html-languageserver", "requires": [ "npm" @@ -346,7 +345,7 @@ ], "ps1": [ { - "refresh_pattern": "\\(\\$\\k*$\\|\\k\\+$\\)", + "refresh_pattern": "\\(\\$\\k*\\|\\k\\+\\)$", "command": "powershell-languageserver", "requires": [ "pwsh" @@ -402,7 +401,7 @@ ], "ruby": [ { - "refresh_pattern": "\\(\\$\\k*$\\|\\k\\+$\\)", + "refresh_pattern": "\\(\\$\\k*\\|\\k\\+\\)$", "command": "solargraph", "requires": [ "gem" 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': []}}, -- cgit v1.2.3-54-g00ecf From 9ee12f79f184102d56ff3ee731aee202b3e5d8fa Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Wed, 5 Feb 2020 19:22:35 +0900 Subject: Fixes refresh_pattern and typed_pattern. --- settings.json | 2 -- settings/powershell-languageserver.vim | 2 +- settings/solargraph.vim | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/settings.json b/settings.json index 3aea50c..40915b0 100644 --- a/settings.json +++ b/settings.json @@ -345,7 +345,6 @@ ], "ps1": [ { - "refresh_pattern": "\\(\\$\\k*\\|\\k\\+\\)$", "command": "powershell-languageserver", "requires": [ "pwsh" @@ -401,7 +400,6 @@ ], "ruby": [ { - "refresh_pattern": "\\(\\$\\k*\\|\\k\\+\\)$", "command": "solargraph", "requires": [ "gem" diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim index 380a7ba..b647002 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': '\(\$\k*\|\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 -- cgit v1.2.3-54-g00ecf From d8559bc8d6ccc4879c34801b3c7512800d853659 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Wed, 5 Feb 2020 19:31:28 +0900 Subject: Fix typed_pattern --- settings/html-languageserver.vim | 2 +- settings/metals.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/html-languageserver.vim b/settings/html-languageserver.vim index 3cbd485..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', {'typed_pattern': '/$\|\k\+$'}), + \ '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 -- cgit v1.2.3-54-g00ecf From c727df7bcaa13202f81fb513ea61d6a75d634b84 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Wed, 5 Feb 2020 19:37:38 +0900 Subject: Fix refresh_pattern and typed_pattern --- settings.json | 1 + settings/powershell-languageserver.vim | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.json b/settings.json index 40915b0..64145b7 100644 --- a/settings.json +++ b/settings.json @@ -345,6 +345,7 @@ ], "ps1": [ { + "refresh_pattern": "\\(\\$[a-zA-Z0-9_:]*\\|\\k\\+\\)$", "command": "powershell-languageserver", "requires": [ "pwsh" diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim index b647002..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('solargraph', 'config', {'typed_pattern': '\(\$\k*\|\k\+\)$'}), + \ 'config': lsp_settings#get('solargraph', 'config', {'typed_pattern': '\(\$[a-zA-Z0-9_:]*\|\k\+\)$'}), \ 'workspace_config': lsp_settings#get('powershell-languageserver', 'workspace_config', {}), \ } augroup END -- cgit v1.2.3-54-g00ecf