summaryrefslogtreecommitdiff
path: root/autoload
diff options
context:
space:
mode:
authorJon Parise <jon@indelible.org>2018-10-30 15:47:19 -0700
committerJon Parise <jon@indelible.org>2018-10-31 08:42:42 -0700
commit2ac9e2a29e3c570e8aac5d8f5404921e8d816006 (patch)
treec43079605550c7821419a68d519e9c2faeebe009 /autoload
parentb5a7593577e1ada3f81fdaa68862ad4e93dcb5a5 (diff)
downloadale-2ac9e2a29e3c570e8aac5d8f5404921e8d816006.zip
Only send LSP config updates when the dict changes
Each LSP connection now stores its configuration dictionary. It is initially empty (`{}`) and is updated each time the LSP connection is started. When a change is detected, the workspace/didChangeConfiguration message is sent to the LSP servers with the updated configuration.
Diffstat (limited to 'autoload')
-rw-r--r--autoload/ale/lsp.vim21
-rw-r--r--autoload/ale/lsp_linter.vim9
2 files changed, 23 insertions, 7 deletions
diff --git a/autoload/ale/lsp.vim b/autoload/ale/lsp.vim
index 196cbe80..74712de1 100644
--- a/autoload/ale/lsp.vim
+++ b/autoload/ale/lsp.vim
@@ -19,6 +19,7 @@ function! ale#lsp#Register(executable_or_address, project, init_options) abort
" initialized: 0 if the connection is ready, 1 otherwise.
" init_request_id: The ID for the init request.
" init_options: Options to send to the server.
+ " config: Configuration settings to send to the server.
" callback_list: A list of callbacks for handling LSP responses.
" message_queue: Messages queued for sending to callbacks.
" capabilities_queue: The list of callbacks to call with capabilities.
@@ -32,6 +33,7 @@ function! ale#lsp#Register(executable_or_address, project, init_options) abort
\ 'initialized': 0,
\ 'init_request_id': 0,
\ 'init_options': a:init_options,
+ \ 'config': {},
\ 'callback_list': [],
\ 'message_queue': [],
\ 'capabilities_queue': [],
@@ -205,6 +207,25 @@ function! s:UpdateCapabilities(conn, capabilities) abort
endif
endfunction
+" Update a connection's configuration dictionary and notify LSP servers
+" of any changes since the last update. Returns 1 if a configuration
+" update was sent; otherwise 0 will be returned.
+function! ale#lsp#UpdateConfig(conn_id, buffer, config) abort
+ let l:conn = get(s:connections, a:conn_id, {})
+
+ if empty(l:conn) || a:config ==# l:conn.config " no-custom-checks
+ return 0
+ endif
+
+ let l:conn.config = a:config
+ let l:message = ale#lsp#message#DidChangeConfiguration(a:buffer, a:config)
+
+ call ale#lsp#Send(a:conn_id, l:message)
+
+ return 1
+endfunction
+
+
function! ale#lsp#HandleInitResponse(conn, response) abort
if get(a:response, 'method', '') is# 'initialize'
let a:conn.initialized = 1
diff --git a/autoload/ale/lsp_linter.vim b/autoload/ale/lsp_linter.vim
index 2ffa6522..42d67398 100644
--- a/autoload/ale/lsp_linter.vim
+++ b/autoload/ale/lsp_linter.vim
@@ -201,13 +201,6 @@ function! ale#lsp_linter#StartLSP(buffer, linter) abort
endif
let l:config = ale#lsp_linter#GetConfig(a:buffer, a:linter)
-
- if !empty(l:config)
- " set LSP configuration options (workspace/didChangeConfiguration)
- let l:config_message = ale#lsp#message#DidChangeConfiguration(a:buffer, l:config)
- call ale#lsp#Send(l:conn_id, l:config_message)
- endif
-
let l:language_id = ale#util#GetFunction(a:linter.language_callback)(a:buffer)
let l:details = {
@@ -218,6 +211,8 @@ function! ale#lsp_linter#StartLSP(buffer, linter) abort
\ 'language_id': l:language_id,
\}
+ call ale#lsp#UpdateConfig(l:conn_id, a:buffer, l:config)
+
if ale#lsp#OpenDocument(l:conn_id, a:buffer, l:language_id)
if g:ale_history_enabled && !empty(l:command)
call ale#history#Add(a:buffer, 'started', l:conn_id, l:command)