Skip to content

Do not send requests/notifications for buffers without a configured server command #1121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2020
Merged

Do not send requests/notifications for buffers without a configured server command #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd933ce
Do not send requests/notifications for buffers without a configured s…
martskins Oct 29, 2020
b2b7c97
Do not enable autocmds for unhandled filetypes
martskins Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions autoload/LanguageClient.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,12 +786,15 @@ function! s:SkipSendingMessage() abort
return v:false
endif

return &buftype !=# '' || &filetype ==# '' || expand('%') ==# ''
let l:commands = get(g:, 'LanguageClient_serverCommands', {})
let l:has_command = has_key(l:commands, &filetype)

return !l:has_command || &buftype !=# '' || &filetype ==# '' || expand('%') ==# ''
endfunction

function! LanguageClient#Call(method, params, callback, ...) abort
if s:SkipSendingMessage()
" call s:Debug('Skip sending message')
echo '[LC] Server not configured for filetype ' . &filetype
return
endif

Expand Down
40 changes: 26 additions & 14 deletions plugin/LanguageClient.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,25 +153,31 @@ endfunction
command! -nargs=* LanguageClientStart :call LanguageClient#startServer(<f-args>)
command! LanguageClientStop call LanguageClient#shutdown()

augroup languageClient
function! s:ConfigureAutocmds()
let l:commands = get(g:, 'LanguageClient_serverCommands', {})
if !has_key(l:commands, &filetype)
" skip setting autocmds if the filetype doesn't have a configured server command
return
endif

call LanguageClient#handleFileType()
augroup languageClient
autocmd!
autocmd FileType * call LanguageClient#handleFileType()
autocmd BufNewFile * call LanguageClient#handleBufNewFile()
autocmd BufEnter * call LanguageClient#handleBufEnter()
autocmd BufWritePost * call LanguageClient#handleBufWritePost()
autocmd BufDelete * call LanguageClient#handleBufDelete()
autocmd TextChanged * call LanguageClient#handleTextChanged()
autocmd TextChangedI * call LanguageClient#handleTextChanged()
autocmd BufNewFile <buffer> call LanguageClient#handleBufNewFile()
autocmd BufEnter <buffer> call LanguageClient#handleBufEnter()
autocmd BufWritePost <buffer> call LanguageClient#handleBufWritePost()
autocmd BufDelete <buffer> call LanguageClient#handleBufDelete()
autocmd TextChanged <buffer> call LanguageClient#handleTextChanged()
autocmd TextChangedI <buffer> call LanguageClient#handleTextChanged()
if exists('##TextChangedP')
autocmd TextChangedP * call LanguageClient#handleTextChanged()
autocmd TextChangedP <buffer> call LanguageClient#handleTextChanged()
endif
autocmd CursorMoved * call LanguageClient#handleCursorMoved()
autocmd VimLeavePre * call LanguageClient#handleVimLeavePre()

autocmd CompleteDone * call LanguageClient#handleCompleteDone()
autocmd CursorMoved <buffer> call LanguageClient#handleCursorMoved()
autocmd VimLeavePre <buffer> call LanguageClient#handleVimLeavePre()

autocmd CompleteDone <buffer> call LanguageClient#handleCompleteDone()
if get(g:, 'LanguageClient_signatureHelpOnCompleteDone', 0)
autocmd CompleteDone *
autocmd CompleteDone <buffer>
\ call LanguageClient#textDocument_signatureHelp({}, 's:HandleOutputNothing')
endif

Expand All @@ -192,4 +198,10 @@ augroup languageClient
nnoremap <Plug>(lcn-format-sync) :call LanguageClient_textDocument_formatting_sync()<CR>
nnoremap <Plug>(lcn-diagnostics-next) :call LanguageClient_diagnosticsNext()<CR>
nnoremap <Plug>(lcn-diagnostics-prev) :call LanguageClient_diagnosticsPrevious()<CR>
augroup END
endfunction

augroup languageClient_fileType
autocmd!
autocmd FileType * call s:ConfigureAutocmds()
augroup END