Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-03 05:40:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(prompt): fix close logic

Browse Source
This commit is contained in:
wsdjeg 2022-10-04 22:15:08 +08:00
parent bb19007e4a
commit d5d1697225
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lua/spacevim/api/prompt.lua
View File

@ -15,7 +15,7 @@ M.__vim = require('spacevim.api').import('vim')
M._keys = { M._keys = {
close = "<Esc>" close = Key.t('<Esc>')
} }
M._prompt = { M._prompt = {
@ -78,22 +78,24 @@ function M._handle_input(...)
M._prompt.cursor_end = M.__cmp.fn.substitute(M._prompt.cursor_end, '^.', '', 'g') M._prompt.cursor_end = M.__cmp.fn.substitute(M._prompt.cursor_end, '^.', '', 'g')
M._build_prompt() M._build_prompt()
goto continue goto continue
elseif char == key.t('<left>') then elseif char == Key.t('<left>') then
elseif char == ket.t('<C-w>') then elseif char == Key.t('<C-w>') then
elseif char == ket.t('<C-a>') or char == ket.t('<Home>') then elseif char == Key.t('<C-a>') or char == Key.t('<Home>') then
elseif char == ket.t('<C-e>') or char == ket.t('<End>') then elseif char == Key.t('<C-e>') or char == Key.t('<End>') then
elseif char == ket.t('<C-u>') then elseif char == Key.t('<C-u>') then
elseif char == ket.t('<C-k>') then elseif char == Key.t('<C-k>') then
elseif char == ket.t('<bs>') then elseif char == Key.t('<bs>') then
elseif (type(self._keys.close) == 1 and char == self._keys.close) elseif (type(M._keys.close) == 'string' and char == M._keys.close)
or (type(self._keys.close) == 3 and index(self._keys.close, char) > -1 ) then or (type(M._keys.close) == 'table' and vim.fn.index(M._keys.close, char) > -1 ) then
elseif char == key.t('<FocusLost>') or char == key.t('<FocusGained>')or char2nr(char) == 128 then M.close()
break
elseif char == Key.t('<FocusLost>') or char == Key.t('<FocusGained>') or vim.fn.char2nr(char) == 128 then
else else
end end
if type(self._oninputpro) == 'function' then if type(M._oninputpro) == 'function' then
self._oninputpro() M._oninputpro()
end end
if type(self._handle_fly) == 'function' then if type(M._handle_fly) == 'function' then
M._handle_fly(M._prompt.cursor_begin M._handle_fly(M._prompt.cursor_begin
.. M._prompt.cursor_char .. M._prompt.cursor_char
.. M._prompt.cursor_end) .. M._prompt.cursor_end)
@ -117,7 +119,11 @@ function M._clear_prompt()
end end
function M.close() function M.close()
if type(M._onclose) == 'function' then
M._onclose()
end
M._clear_prompt()
M._quit = true
end end

4
lua/spacevim/api/vim/compatible.lua
View File

@ -124,4 +124,8 @@ function M.execute(cmd, silent)
return M.fn.execute(cmd, silent) return M.fn.execute(cmd, silent)
end end
function M.win_screenpos(nr)
return vim.fn.win_screenpos(nr)
end
return M return M