From 684b8e9505e24d69ccd352c0940f04ce2ce0da68 Mon Sep 17 00:00:00 2001 From: Andreas Louv Date: Sun, 2 Apr 2023 22:52:56 +0200 Subject: [PATCH] Rename "SignatureInit" to "BufferInit" --- autoload/lsp/lsp.vim | 9 ++++----- autoload/lsp/signature.vim | 11 ++++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/autoload/lsp/lsp.vim b/autoload/lsp/lsp.vim index 3f9be04..39d4ffe 100644 --- a/autoload/lsp/lsp.vim +++ b/autoload/lsp/lsp.vim @@ -323,14 +323,13 @@ def BufferInit(bnr: number): void # add a listener to track changes to this buffer listener_add(Bufchange_listener, bnr) - completion.BufferInit(lspserver, bnr, ftype) + AddBufLocalAutocmds(lspserver, bnr) setbufvar(bnr, '&balloonexpr', 'g:LspDiagExpr()') - # initialize signature help - signature.SignatureInit(lspserver) - - AddBufLocalAutocmds(lspserver, bnr) + completion.BufferInit(lspserver, bnr, ftype) + signature.BufferInit(lspserver) + inlayhints.BufferInit(lspserver, bnr) if exists('#User#LspAttached') doautocmd User LspAttached diff --git a/autoload/lsp/signature.vim b/autoload/lsp/signature.vim index 590718f..945e7af 100644 --- a/autoload/lsp/signature.vim +++ b/autoload/lsp/signature.vim @@ -22,18 +22,23 @@ def CloseCurBufSignaturePopup() enddef # Initialize the signature triggers for the current buffer -export def SignatureInit(lspserver: dict) - if !opt.lspOptions.showSignature - || !lspserver.isSignatureHelpProvider +export def BufferInit(lspserver: dict) + if !lspserver.isSignatureHelpProvider || !lspserver.caps.signatureHelpProvider->has_key('triggerCharacters') # no support for signature help return endif + if !opt.lspOptions.showSignature + # Show signature are disabled + return + endif + # map characters that trigger signature help for ch in lspserver.caps.signatureHelpProvider.triggerCharacters exe $"inoremap {ch} {ch}=LspShowSignature()" endfor + # close the signature popup when leaving insert mode autocmd_add([{bufnr: bufnr(), event: 'InsertLeave', -- 2.48.1