Skip to content
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

Improve signature popup window #448

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Improve signature popup window #448

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c6e69f
Improve signature popup window
girishji Jan 30, 2024
aa3777f
Correctly handle keys inside symbol popup window
girishji Feb 1, 2024
c65c157
Changes as requested
girishji Feb 4, 2024
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
2 changes: 1 addition & 1 deletion autoload/lsp/signature.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export def SignatureHelp(lspserver: dict<any>, sighelp: any): void
# Close the previous signature popup and open a new one
lspserver.signaturePopup->popup_close()

var popupID = text->popup_atcursor({moved: [col('.') - 1, 9999999]})
var popupID = text->popup_atcursor({padding: [0, 1, 0, 1], moved: [col('.') - 1, 9999999]})
var bnr: number = popupID->winbufnr()
prop_type_add('signature', {bufnr: bnr, highlight: 'LspSigActiveParameter'})
if hllen > 0
Expand Down
41 changes: 28 additions & 13 deletions autoload/lsp/symbol.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ enddef
# Key filter function for the symbol popup menu.
def SymbolMenuFilterKey(symPopupMenu: number,
key: string): bool
var keyHandled = false
var keyHandled = true
var updateInputPopup = false
var inputText = symPopupMenu->getwinvar('inputText', '')
var symInputPopup = symPopupMenu->getwinvar('symbolInputPopup', 0)
Expand All @@ -811,33 +811,48 @@ def SymbolMenuFilterKey(symPopupMenu: number,
# Erase a character in the input popup
if inputText->len() >= 1
inputText = inputText[: -2]
keyHandled = true
updateInputPopup = true
else
keyHandled = false
endif
elseif key == "\<C-U>"
# Erase all the characters in the input popup
inputText = ''
keyHandled = true
updateInputPopup = true
elseif key == "\<tab>"
|| key == "\<C-n>"
|| key == "\<Down>"
|| key == "\<ScrollWheelDown>"
var ln = getcurpos(symPopupMenu)[1]
win_execute(symPopupMenu, "normal! j")
if ln == getcurpos(symPopupMenu)[1]
win_execute(symPopupMenu, "normal! gg")
endif
elseif key == "\<S-tab>"
|| key == "\<C-p>"
|| key == "\<Up>"
|| key == "\<ScrollWheelUp>"
girishji marked this conversation as resolved.
Show resolved Hide resolved
var ln = getcurpos(symPopupMenu)[1]
win_execute(symPopupMenu, "normal! k")
if ln == getcurpos(symPopupMenu)[1]
win_execute(symPopupMenu, "normal! G")
endif
elseif key == "\<PageDown>"
win_execute(symPopupMenu, 'normal! ' .. "\<C-d>")
girishji marked this conversation as resolved.
Show resolved Hide resolved
elseif key == "\<PageUp>"
win_execute(symPopupMenu, 'normal! ' .. "\<C-u>")
girishji marked this conversation as resolved.
Show resolved Hide resolved
elseif key == "\<C-F>"
|| key == "\<C-B>"
|| key == "\<PageUp>"
|| key == "\<PageDown>"
|| key == "\<C-Home>"
|| key == "\<C-End>"
|| key == "\<C-N>"
|| key == "\<C-P>"
# scroll the symbol popup window
var cmd: string = 'normal! ' .. (key == "\<C-N>" ? 'j' :
key == "\<C-P>" ? 'k' : key)
win_execute(symPopupMenu, cmd)
keyHandled = true
win_execute(symPopupMenu, $"normal! {key}")
elseif key =~ '^\k$'
# A keyword character is typed. Add to the input text and update the
# popup
inputText ..= key
keyHandled = true
updateInputPopup = true
else
keyHandled = false
endif

var symTblFiltered: list<dict<any>> = []
Expand Down