Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-13 10:15:41 +08:00
Code Issues Projects Releases Wiki Activity

feat(guide): rewrite leader guide in lua

Browse Source
This commit is contained in:
Eric Wong 2023-08-25 12:05:54 +08:00 committed by GitHub
parent 100aa31e52
commit 7e81ce1019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1510 additions and 1258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
autoload/SpaceVim/mapping/guide.vim
View File

@ -6,7 +6,6 @@
" License: GPLv3 " License: GPLv3
"============================================================================= "=============================================================================
scriptencoding utf-8 scriptencoding utf-8
if exists('s:save_cpo') if exists('s:save_cpo')
finish finish
endif endif
@ -14,50 +13,96 @@ endif
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo&vim set cpo&vim
" Load SpaceVim API if has('nvim-0.9.0')
let s:CMP = SpaceVim#api#import('vim#compatible')
let s:STR = SpaceVim#api#import('data#string') function! SpaceVim#mapping#guide#parse_mappings() abort " {{{
let s:KEY = SpaceVim#api#import('vim#key') lua require("spacevim.plugin.guide").parse_mappings()
let s:VIM = SpaceVim#api#import('vim') endfunction "}}}
let s:BUFFER = SpaceVim#api#import('vim#buffer') function! SpaceVim#mapping#guide#start(vis, dict) abort " {{{
if has('nvim') lua require("spacevim.plugin.guide").start(
let s:FLOATING = SpaceVim#api#import('neovim#floating') \ require("spacevim").eval("a:vis"),
\ require("spacevim").eval("a:dict")
\ )
endfunction "}}}
function! SpaceVim#mapping#guide#has_configuration() abort "{{{
return luaeval('require("spacevim.plugin.guide").has_configuration()')
endfunction "}}}
function! SpaceVim#mapping#guide#start_by_prefix(vis, key) abort " {{{
lua require("spacevim.plugin.guide").start_by_prefix(
\ require("spacevim").eval("a:vis"),
\ require("spacevim").eval("a:key")
\ )
endfunction "}}}
function! SpaceVim#mapping#guide#register_displayname(lhs, name) abort
lua require("spacevim.plugin.guide").register_displayname(
\ require("spacevim").eval("a:lhs"),
\ require("spacevim").eval("a:name")
\ )
endfunction "}}}
function! SpaceVim#mapping#guide#populate_dictionary(key, dictname) abort " {{{
lua require("spacevim.plugin.guide").populate_dictionary(
\ require("spacevim").eval("a:key"),
\ require("spacevim").eval("a:dictname")
\ )
endfunction "}}}
function! SpaceVim#mapping#guide#register_prefix_descriptions(key, dictname) abort " {{{
lua require("spacevim.plugin.guide").register_prefix_descriptions(
\ require("spacevim").eval("a:key"),
\ require("spacevim").eval("a:dictname")
\ )
endfunction "}}}
function! SpaceVim#mapping#guide#displayfunc() abort
lua require("spacevim.plugin.guide").displayfunc()
endfunction
else else
" Load SpaceVim API
let s:CMP = SpaceVim#api#import('vim#compatible')
let s:STR = SpaceVim#api#import('data#string')
let s:KEY = SpaceVim#api#import('vim#key')
let s:VIM = SpaceVim#api#import('vim')
let s:BUFFER = SpaceVim#api#import('vim#buffer')
if has('nvim')
let s:FLOATING = SpaceVim#api#import('neovim#floating')
else
let s:FLOATING = SpaceVim#api#import('vim#floating') let s:FLOATING = SpaceVim#api#import('vim#floating')
endif endif
let s:SL = SpaceVim#api#import('vim#statusline') let s:SL = SpaceVim#api#import('vim#statusline')
let s:LOG =SpaceVim#logger#derive('guide')
" guide specific var " guide specific var
let s:winid = -1 let s:winid = -1
let s:bufnr = -1 let s:bufnr = -1
let s:prefix_key_inp = [] let s:prefix_key_inp = []
let s:lmap = {} let s:lmap = {}
" this should be the history of s:lmap and s:guide_group " this should be the history of s:lmap and s:guide_group
let s:undo_history = [] let s:undo_history = []
let s:registered_name = {}
function! SpaceVim#mapping#guide#has_configuration() abort "{{{ function! SpaceVim#mapping#guide#has_configuration() abort "{{{
return exists('s:desc_lookup') return exists('s:desc_lookup')
endfunction "}}} endfunction "}}}
function! SpaceVim#mapping#guide#register_prefix_descriptions(key, dictname) abort " {{{ function! SpaceVim#mapping#guide#register_prefix_descriptions(key, dictname) abort " {{{
let key = a:key ==? '<Space>' ? ' ' : a:key let key = a:key ==? '<Space>' ? ' ' : a:key
if !exists('s:desc_lookup') if !exists('s:desc_lookup')
call s:create_cache() call s:create_cache()
endif endif
if strlen(key) == 0 if strlen(key) == 0
let s:desc_lookup['top'] = a:dictname let s:desc_lookup['top'] = a:dictname
return elseif !has_key(s:desc_lookup, key)
endif
if !has_key(s:desc_lookup, key)
let s:desc_lookup[key] = a:dictname let s:desc_lookup[key] = a:dictname
endif endif
endfunction "}}} call s:LOG.debug('desc_lookup is:' . string(s:desc_lookup))
function! s:create_cache() abort " {{{ endfunction "}}}
function! s:create_cache() abort " {{{
let s:desc_lookup = {} let s:desc_lookup = {}
let s:cached_dicts = {} let s:cached_dicts = {}
endfunction " }}} endfunction " }}}
function! s:create_target_dict(key) abort " {{{ function! s:create_target_dict(key) abort " {{{
if has_key(s:desc_lookup, 'top') if has_key(s:desc_lookup, 'top')
" use {expr} to eval viml value
let toplevel = deepcopy({s:desc_lookup['top']}) let toplevel = deepcopy({s:desc_lookup['top']})
let tardict = s:toplevel ? toplevel : get(toplevel, a:key, {}) let tardict = s:toplevel ? toplevel : get(toplevel, a:key, {})
let mapdict = s:cached_dicts[a:key] let mapdict = s:cached_dicts[a:key]
@ -70,8 +115,8 @@ function! s:create_target_dict(key) abort " {{{
let tardict = s:cached_dicts[a:key] let tardict = s:cached_dicts[a:key]
endif endif
return tardict return tardict
endfunction " }}} endfunction " }}}
function! s:merge(dict_t, dict_o) abort " {{{ function! s:merge(dict_t, dict_o) abort " {{{
let target = a:dict_t let target = a:dict_t
let other = a:dict_o let other = a:dict_o
for k in keys(target) for k in keys(target)
@ -93,22 +138,22 @@ function! s:merge(dict_t, dict_o) abort " {{{
endif endif
endfor endfor
call extend(target, other, 'keep') call extend(target, other, 'keep')
endfunction " }}} endfunction " }}}
" @vimlint(EVL103, 1, a:dictname) " @vimlint(EVL103, 1, a:dictname)
function! SpaceVim#mapping#guide#populate_dictionary(key, dictname) abort " {{{ function! SpaceVim#mapping#guide#populate_dictionary(key, dictname) abort " {{{
call s:start_parser(a:key, s:cached_dicts[a:key]) call s:start_parser(a:key, s:cached_dicts[a:key])
endfunction " }}} endfunction " }}}
" @vimlint(EVL103, 0, a:dictname) " @vimlint(EVL103, 0, a:dictname)
function! SpaceVim#mapping#guide#parse_mappings() abort " {{{ function! SpaceVim#mapping#guide#parse_mappings() abort " {{{
for [k, v] in items(s:cached_dicts) for [k, v] in items(s:cached_dicts)
call s:start_parser(k, v) call s:start_parser(k, v)
endfor endfor
endfunction " }}} endfunction " }}}
function! s:start_parser(key, dict) abort " {{{ function! s:start_parser(key, dict) abort " {{{
if a:key ==# '[KEYs]' if a:key ==# '[KEYs]'
return return
endif endif
@ -144,9 +189,9 @@ function! s:start_parser(key, dict) abort " {{{
endif endif
endif endif
endfor endfor
endfunction " }}} endfunction " }}}
function! s:add_map_to_dict(map, level, dict) abort " {{{ function! s:add_map_to_dict(map, level, dict) abort " {{{
if len(a:map.lhs) > a:level+1 if len(a:map.lhs) > a:level+1
let curkey = a:map.lhs[a:level] let curkey = a:map.lhs[a:level]
let nlevel = a:level+1 let nlevel = a:level+1
@ -184,9 +229,9 @@ function! s:add_map_to_dict(map, level, dict) abort " {{{
let a:dict[a:map.lhs[a:level]] = [cmd, a:map.display] let a:dict[a:map.lhs[a:level]] = [cmd, a:map.display]
endif endif
endif endif
endfunction " }}} endfunction " }}}
" @vimlint(EVL111, 1, Fun) " @vimlint(EVL111, 1, Fun)
function! s:format_displaystring(map) abort " {{{ function! s:format_displaystring(map) abort " {{{
let g:leaderGuide#displayname = a:map let g:leaderGuide#displayname = a:map
for Fun in g:leaderGuide_displayfunc for Fun in g:leaderGuide_displayfunc
call Fun() call Fun()
@ -194,9 +239,9 @@ function! s:format_displaystring(map) abort " {{{
let display = g:leaderGuide#displayname let display = g:leaderGuide#displayname
unlet g:leaderGuide#displayname unlet g:leaderGuide#displayname
return display return display
endfunction " }}} endfunction " }}}
" @vimlint(EVL111, 0, Fun) " @vimlint(EVL111, 0, Fun)
function! s:flattenmap(dict, str) abort " {{{ function! s:flattenmap(dict, str) abort " {{{
let ret = {} let ret = {}
for kv in keys(a:dict) for kv in keys(a:dict)
if type(a:dict[kv]) == type([]) if type(a:dict[kv]) == type([])
@ -208,17 +253,17 @@ function! s:flattenmap(dict, str) abort " {{{
endif endif
endfor endfor
return ret return ret
endfunction " }}} endfunction " }}}
function! s:escape_mappings(mapping) abort " {{{ function! s:escape_mappings(mapping) abort " {{{
let rstring = substitute(a:mapping.rhs, '\', '\\\\', 'g') let rstring = substitute(a:mapping.rhs, '\', '\\\\', 'g')
let rstring = substitute(rstring, '<\([^<>]*\)>', '\\<\1>', 'g') let rstring = substitute(rstring, '<\([^<>]*\)>', '\\<\1>', 'g')
let rstring = substitute(rstring, '"', '\\"', 'g') let rstring = substitute(rstring, '"', '\\"', 'g')
let rstring = 'call feedkeys("'.rstring.'", "'.a:mapping.feedkeyargs.'")' let rstring = 'call feedkeys("'.rstring.'", "'.a:mapping.feedkeyargs.'")'
return rstring return rstring
endfunction " }}} endfunction " }}}
function! s:string_to_keys(input) abort " {{{ function! s:string_to_keys(input) abort
" Avoid special case: <> " Avoid special case: <>
let retlist = [] let retlist = []
if match(a:input, '<.\+>') != -1 if match(a:input, '<.\+>') != -1
@ -238,9 +283,9 @@ function! s:string_to_keys(input) abort " {{{
let go = 0 let go = 0
elseif a:input[si] ==? '>' elseif a:input[si] ==? '>'
let go = 1 let go = 1
end endif
let si += 1 let si += 1
endw endwhile
else else
for it in split(a:input, '\zs') for it in split(a:input, '\zs')
if it ==# ' ' if it ==# ' '
@ -251,13 +296,13 @@ function! s:string_to_keys(input) abort " {{{
endfor endfor
endif endif
return retlist return retlist
endfunction " }}} endfunction
function! s:escape_keys(inp) abort " {{{ function! s:escape_keys(inp) abort " {{{
let ret = substitute(a:inp, '<', '<lt>', '') let ret = substitute(a:inp, '<', '<lt>', '')
return substitute(ret, '|', '<Bar>', '') return substitute(ret, '|', '<Bar>', '')
endfunction " }}} endfunction " }}}
function! s:calc_layout() abort " {{{ function! s:calc_layout() abort " {{{
let ret = {} let ret = {}
let smap = filter(copy(s:lmap), 'v:key !=# "name"') let smap = filter(copy(s:lmap), 'v:key !=# "name"')
let ret.n_items = len(smap) let ret.n_items = len(smap)
@ -265,6 +310,7 @@ function! s:calc_layout() abort " {{{
\ 'strdisplaywidth(repeat(" ", 8 - strlen(v:key)) . "[".v:key."]".'. \ 'strdisplaywidth(repeat(" ", 8 - strlen(v:key)) . "[".v:key."]".'.
\ '(type(v:val) == type({}) ? v:val["name"] : v:val[1]))')) \ '(type(v:val) == type({}) ? v:val["name"] : v:val[1]))'))
let maxlength = max(length) + g:leaderGuide_hspace let maxlength = max(length) + g:leaderGuide_hspace
call s:LOG.debug('maxlength is:' . maxlength)
if g:leaderGuide_vertical if g:leaderGuide_vertical
let ret.n_rows = winheight(0) - 2 let ret.n_rows = winheight(0) - 2
let ret.n_cols = ret.n_items / ret.n_rows + (ret.n_items != ret.n_rows) let ret.n_cols = ret.n_items / ret.n_rows + (ret.n_items != ret.n_rows)
@ -276,16 +322,17 @@ function! s:calc_layout() abort " {{{
let ret.n_rows = ret.n_items / ret.n_cols + (fmod(ret.n_items,ret.n_cols) > 0 ? 1 : 0) let ret.n_rows = ret.n_items / ret.n_cols + (fmod(ret.n_items,ret.n_cols) > 0 ? 1 : 0)
let ret.win_dim = ret.n_rows let ret.win_dim = ret.n_rows
endif endif
call s:LOG.debug('layout is:' . string(ret))
return ret return ret
endfunction " }}} endfunction " }}}
" icon -> number -> A-Za-z " icon -> number -> A-Za-z
" 65-90 97-122 " 65-90 97-122
function! s:get_key_number(key) abort function! s:get_key_number(key) abort
return char2nr(a:key ==# '[SPC]' ? ' ' : a:key ==? '<Tab>' ? "\t" : a:key) return char2nr(a:key ==# '[SPC]' ? ' ' : a:key ==? '<Tab>' ? "\t" : a:key)
endfunction endfunction
function! s:compare_key(i1, i2) abort function! s:compare_key(i1, i2) abort
let a = s:get_key_number(a:i1) let a = s:get_key_number(a:i1)
let b = s:get_key_number(a:i2) let b = s:get_key_number(a:i2)
if a - b == 32 && a >= 97 && a <= 122 if a - b == 32 && a >= 97 && a <= 122
@ -302,9 +349,9 @@ function! s:compare_key(i1, i2) abort
return s:compare_key(nr2char(a), nr2char(b - 32)) return s:compare_key(nr2char(a), nr2char(b - 32))
endif endif
return a == b ? 0 : a > b ? 1 : -1 return a == b ? 0 : a > b ? 1 : -1
endfunction endfunction
function! s:create_string(layout) abort " {{{ function! s:create_string(layout) abort " {{{
let l = a:layout let l = a:layout
let l.capacity = l.n_rows * l.n_cols let l.capacity = l.n_rows * l.n_cols
let overcap = l.capacity - l.n_items let overcap = l.capacity - l.n_items
@ -362,10 +409,10 @@ function! s:create_string(layout) abort " {{{
endfor endfor
let output = join(r, "\n") let output = join(r, "\n")
return output return output
endfunction " }}} endfunction " }}}
let s:VIMH = SpaceVim#api#import('vim#highlight') let s:VIMH = SpaceVim#api#import('vim#highlight')
function! s:highlight_cursor() abort function! s:highlight_cursor() abort
let info = { let info = {
\ 'name' : 'SpaceVimGuideCursor', \ 'name' : 'SpaceVimGuideCursor',
\ 'guibg' : synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'guifg'), \ 'guibg' : synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'guifg'),
@ -393,17 +440,17 @@ function! s:highlight_cursor() abort
else else
let s:cursor_hi = s:CMP.matchaddpos('SpaceVimGuideCursor', [[line('.'), col('.'), 1]]) let s:cursor_hi = s:CMP.matchaddpos('SpaceVimGuideCursor', [[line('.'), col('.'), 1]])
endif endif
endfunction endfunction
function! s:remove_cursor_highlight() abort function! s:remove_cursor_highlight() abort
try try
call matchdelete(s:cursor_hi) call matchdelete(s:cursor_hi)
catch catch
endtry endtry
endfunction endfunction
" @vimlint(EVL102, 1, l:string) " @vimlint(EVL102, 1, l:string)
function! s:start_buffer() abort " {{{ function! s:start_buffer() abort " {{{
let s:winv = winsaveview() let s:winv = winsaveview()
let s:winnr = winnr() let s:winnr = winnr()
let s:winres = winrestcmd() let s:winres = winrestcmd()
@ -442,10 +489,10 @@ function! s:start_buffer() abort " {{{
call setbufvar(s:bufnr, '&modifiable', 0) call setbufvar(s:bufnr, '&modifiable', 0)
redraw! redraw!
call s:wait_for_input() call s:wait_for_input()
endfunction " }}} endfunction " }}}
" @vimlint(EVL102, 0, l:string) " @vimlint(EVL102, 0, l:string)
function! s:handle_input(input) abort " {{{ function! s:handle_input(input) abort " {{{
call s:winclose() call s:winclose()
if type(a:input) ==? type({}) if type(a:input) ==? type({})
let s:lmap = a:input let s:lmap = a:input
@ -460,10 +507,10 @@ function! s:handle_input(input) abort " {{{
unsilent echom v:exception unsilent echom v:exception
endtry endtry
endif endif
endfunction " }}} endfunction " }}}
" wait for in input sub function should be not block vim " wait for in input sub function should be not block vim
function! s:wait_for_input() abort " {{{ function! s:wait_for_input() abort " {{{
redraw! redraw!
let inp = s:VIM.getchar() let inp = s:VIM.getchar()
if inp ==# "\<Esc>" if inp ==# "\<Esc>"
@ -506,9 +553,9 @@ function! s:wait_for_input() abort " {{{
let s:guide_help_mode = 0 let s:guide_help_mode = 0
endif endif
endif endif
endfunction " }}} endfunction " }}}
function! s:build_mpt(mpt) abort function! s:build_mpt(mpt) abort
normal! : normal! :
echohl Comment echohl Comment
if type(a:mpt) == 1 if type(a:mpt) == 1
@ -517,12 +564,12 @@ function! s:build_mpt(mpt) abort
echon join(a:mpt) echon join(a:mpt)
endif endif
echohl NONE echohl NONE
endfunction endfunction
" change this func, do not focus to the new windows, and return winid. " change this func, do not focus to the new windows, and return winid.
function! s:winopen() abort " {{{ function! s:winopen() abort " {{{
call s:highlight_cursor() call s:highlight_cursor()
let pos = g:leaderGuide_position ==? 'topleft' ? 'topleft' : 'botright' let pos = g:leaderGuide_position ==? 'topleft' ? 'topleft' : 'botright'
if s:FLOATING.exists() if s:FLOATING.exists()
@ -590,9 +637,9 @@ function! s:winopen() abort " {{{
call s:updateStatusline() call s:updateStatusline()
call s:toggle_hide_cursor() call s:toggle_hide_cursor()
return [s:winid, s:bufnr] return [s:winid, s:bufnr]
endfunction " }}} endfunction " }}}
if s:SL.support_float() if s:SL.support_float()
function! s:updateStatusline() abort function! s:updateStatusline() abort
call SpaceVim#mapping#guide#theme#hi() call SpaceVim#mapping#guide#theme#hi()
let gname = get(s:guide_group, 'name', '') let gname = get(s:guide_group, 'name', '')
@ -617,7 +664,7 @@ if s:SL.support_float()
call SpaceVim#logger#debug('close float statusline winid:' . s:SL.__winid) call SpaceVim#logger#debug('close float statusline winid:' . s:SL.__winid)
call s:SL.close_float() call s:SL.close_float()
endfunction endfunction
else else
function! s:updateStatusline() abort function! s:updateStatusline() abort
call SpaceVim#mapping#guide#theme#hi() call SpaceVim#mapping#guide#theme#hi()
let gname = get(s:guide_group, 'name', '') let gname = get(s:guide_group, 'name', '')
@ -633,30 +680,30 @@ else
\ . ' %#LeaderGuiderSep2#' . s:lsep . '%#LeaderGuiderFill#' \ . ' %#LeaderGuiderSep2#' . s:lsep . '%#LeaderGuiderFill#'
\ . s:guide_help_msg(0)) \ . s:guide_help_msg(0))
endfunction endfunction
endif endif
function! Test_st() abort function! Test_st() abort
call s:updateStatusline() call s:updateStatusline()
endfunction endfunction
function! s:guide_help_msg(escape) abort function! s:guide_help_msg(escape) abort
if s:guide_help_mode == 1 if s:guide_help_mode == 1
let msg = ' n -> next-page, p -> previous-page, u -> undo-key' let msg = ' n -> next-page, p -> previous-page, u -> undo-key'
else else
let msg = ' [C-h paging/help]' let msg = ' [C-h paging/help]'
endif endif
return a:escape ? substitute(msg,' ', '\\ ', 'g') : msg return a:escape ? substitute(msg,' ', '\\ ', 'g') : msg
endfunction endfunction
let s:t_ve = '' let s:t_ve = ''
function! s:toggle_hide_cursor() abort function! s:toggle_hide_cursor() abort
let t_ve = &t_ve let t_ve = &t_ve
let &t_ve = s:t_ve let &t_ve = s:t_ve
let s:t_ve = t_ve let s:t_ve = t_ve
endfunction endfunction
function! s:winclose() abort " {{{ function! s:winclose() abort " {{{
call s:toggle_hide_cursor() call s:toggle_hide_cursor()
if s:FLOATING.exists() if s:FLOATING.exists()
call s:FLOATING.win_close(s:winid, 1) call s:FLOATING.win_close(s:winid, 1)
@ -678,14 +725,14 @@ function! s:winclose() abort " {{{
endif endif
endif endif
call s:remove_cursor_highlight() call s:remove_cursor_highlight()
endfunction " }}} endfunction " }}}
function! s:page_down() abort " {{{ function! s:page_down() abort " {{{
call feedkeys("\<c-c>", 'n') call feedkeys("\<c-c>", 'n')
call feedkeys("\<c-d>", 'x') call feedkeys("\<c-d>", 'x')
redraw! redraw!
call s:wait_for_input() call s:wait_for_input()
endfunction " }}} endfunction " }}}
function! s:page_undo() abort " {{{ function! s:page_undo() abort " {{{
call s:winclose() call s:winclose()
if len(s:prefix_key_inp) > 0 if len(s:prefix_key_inp) > 0
call remove(s:prefix_key_inp, -1) call remove(s:prefix_key_inp, -1)
@ -694,15 +741,15 @@ function! s:page_undo() abort " {{{
let s:lmap = remove(s:undo_history, -1) let s:lmap = remove(s:undo_history, -1)
endif endif
call s:start_buffer() call s:start_buffer()
endfunction " }}} endfunction " }}}
function! s:page_up() abort " {{{ function! s:page_up() abort " {{{
call feedkeys("\<c-c>", 'n') call feedkeys("\<c-c>", 'n')
call feedkeys("\<c-u>", 'x') call feedkeys("\<c-u>", 'x')
redraw! redraw!
call s:wait_for_input() call s:wait_for_input()
endfunction " }}} endfunction " }}}
function! s:handle_submode_mapping(cmd) abort " {{{ function! s:handle_submode_mapping(cmd) abort " {{{
let s:guide_help_mode = 0 let s:guide_help_mode = 0
call s:updateStatusline() call s:updateStatusline()
if a:cmd ==# 'n' if a:cmd ==# 'n'
@ -714,11 +761,11 @@ function! s:handle_submode_mapping(cmd) abort " {{{
else else
call s:winclose() call s:winclose()
endif endif
endfunction " }}} endfunction " }}}
function! s:submode_mappings(key) abort " {{{ function! s:submode_mappings(key) abort " {{{
silent call s:handle_submode_mapping(a:key) silent call s:handle_submode_mapping(a:key)
endfunction " }}} endfunction " }}}
function! s:mapmaparg(maparg) abort " {{{ function! s:mapmaparg(maparg) abort " {{{
let noremap = a:maparg.noremap ? 'noremap' : 'map' let noremap = a:maparg.noremap ? 'noremap' : 'map'
let buffer = a:maparg.buffer ? '<buffer> ' : '' let buffer = a:maparg.buffer ? '<buffer> ' : ''
let silent = a:maparg.silent ? '<silent> ' : '' let silent = a:maparg.silent ? '<silent> ' : ''
@ -726,9 +773,9 @@ function! s:mapmaparg(maparg) abort " {{{
let st = a:maparg.mode . '' . noremap . ' ' . nowait . silent . buffer let st = a:maparg.mode . '' . noremap . ' ' . nowait . silent . buffer
\ . '' .a:maparg.lhs . ' ' . a:maparg.rhs \ . '' .a:maparg.lhs . ' ' . a:maparg.rhs
execute st execute st
endfunction " }}} endfunction " }}}
function! s:get_register() abort "{{{ function! s:get_register() abort "{{{
if match(&clipboard, 'unnamedplus') >= 0 if match(&clipboard, 'unnamedplus') >= 0
let clip = '+' let clip = '+'
elseif match(&clipboard, 'unnamed') >= 0 elseif match(&clipboard, 'unnamed') >= 0
@ -737,8 +784,8 @@ function! s:get_register() abort "{{{
let clip = '"' let clip = '"'
endif endif
return clip return clip
endfunction "}}} endfunction "}}}
function! SpaceVim#mapping#guide#start_by_prefix(vis, key) abort " {{{ function! SpaceVim#mapping#guide#start_by_prefix(vis, key) abort " {{{
if a:key ==# ' ' && exists('b:spacevim_lang_specified_mappings') if a:key ==# ' ' && exists('b:spacevim_lang_specified_mappings')
let g:_spacevim_mappings_space.l = b:spacevim_lang_specified_mappings let g:_spacevim_mappings_space.l = b:spacevim_lang_specified_mappings
endif endif
@ -767,28 +814,29 @@ function! SpaceVim#mapping#guide#start_by_prefix(vis, key) abort " {{{
let rundict = s:cached_dicts[a:key] let rundict = s:cached_dicts[a:key]
endif endif
let s:lmap = rundict let s:lmap = rundict
call s:LOG.debug('lmap is:' . string(s:lmap))
call s:start_buffer() call s:start_buffer()
endfunction " }}} endfunction " }}}
function! SpaceVim#mapping#guide#start(vis, dict) abort " {{{ function! SpaceVim#mapping#guide#start(vis, dict) abort " {{{
let s:vis = a:vis ? 'gv' : 0 let s:vis = a:vis ? 'gv' : 0
let s:lmap = a:dict let s:lmap = a:dict
call s:start_buffer() call s:start_buffer()
endfunction " }}} endfunction " }}}
function! SpaceVim#mapping#guide#register_displayname(lhs, name) abort
if !exists('g:leaderGuide_displayfunc') call extend(s:registered_name, {a:lhs : a:name})
function! s:leaderGuide_display() abort endfunction
function! SpaceVim#mapping#guide#displayfunc() abort
if has_key(s:registered_name, g:leaderGuide#displayname) if has_key(s:registered_name, g:leaderGuide#displayname)
return s:registered_name[g:leaderGuide#displayname] return s:registered_name[g:leaderGuide#displayname]
endif endif
let g:leaderGuide#displayname = substitute(g:leaderGuide#displayname, '\c<cr>$', '', '') let g:leaderGuide#displayname = substitute(g:leaderGuide#displayname, '\c<cr>$', '', '')
endfunction endfunction
let g:leaderGuide_displayfunc = [function('s:leaderGuide_display')]
endif endif
let s:registered_name = {} if !exists('g:leaderGuide_displayfunc')
function! SpaceVim#mapping#guide#register_displayname(lhs, name) abort let g:leaderGuide_displayfunc = [function('SpaceVim#mapping#guide#displayfunc')]
call extend(s:registered_name, {a:lhs : a:name}) endif
endfunction
if get(g:, 'mapleader', '\') ==# ' ' if get(g:, 'mapleader', '\') ==# ' '
call SpaceVim#mapping#guide#register_prefix_descriptions(' ', call SpaceVim#mapping#guide#register_prefix_descriptions(' ',

2
bundle/neodev.nvim/types/nightly/vim.fn.lua vendored
View File

@ -5655,7 +5655,7 @@ function vim.fn.matchadd(group, pattern, priority, id, dict) end
-- ```vim -- ```vim
-- GetGroup()->matchaddpos([23, 11]) -- GetGroup()->matchaddpos([23, 11])
-- ``` -- ```
--- @param pos number --- @param pos number|table
--- @param priority? any --- @param priority? any
--- @param id? any --- @param id? any
--- @param dict? table<string, any> --- @param dict? table<string, any>

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

@ -23,6 +23,10 @@ function M.getchar(...)
end end
end end
function M.setbufvar(buf, opts)
end
function M.getchar2nr(...) function M.getchar2nr(...)
local status, ret = pcall(vim.fn.getchar, ...) local status, ret = pcall(vim.fn.getchar, ...)
if not status then if not status then

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

@ -8,6 +8,10 @@
local M = {} local M = {}
function M.create_buf(listed, scratch)
return vim.api.nvim_create_buf(listed, scratch)
end
function M.set_lines(bufnr, startindex, endindex, replacement) function M.set_lines(bufnr, startindex, endindex, replacement)
if startindex < 0 then if startindex < 0 then
startindex = #vim.buffer(bufnr) + 1 + startindex startindex = #vim.buffer(bufnr) + 1 + startindex

32
lua/spacevim/api/vim/keys.lua
View File

@ -1,11 +1,12 @@
--!/usr/bin/lua --!/usr/bin/lua
local M = {} local M = {}
local specified_keys = {}
function M.t(str) function M.t(str)
if vim.api ~= nil and vim.api.nvim_replace_termcodes ~= nil then if vim.api ~= nil and vim.api.nvim_replace_termcodes ~= nil then
-- https://github.com/neovim/neovim/issues/17369 -- https://github.com/neovim/neovim/issues/17369
local ret = vim.api.nvim_replace_termcodes(str, false, true, true):gsub("\128\254X", "\128") local ret = vim.api.nvim_replace_termcodes(str, false, true, true):gsub('\128\254X', '\128')
return ret return ret
else else
-- local ret = vim.fn.execute('echon "\\' .. str .. '"') -- local ret = vim.fn.execute('echon "\\' .. str .. '"')
@ -15,4 +16,33 @@ function M.t(str)
end end
end end
function M.char2name(c)
if #c == 1 then
return M.nr2name(vim.fn.char2nr(c))
end
return specified_keys[c] or c
end
function M.nr2name(nr)
if type(nr) == 'number' then
if nr == 32 then
return 'SPC'
elseif nr == 4 then
return '<C-d>'
elseif nr == 3 then
return '<C-c>'
elseif nr == 9 then
return '<Tab>'
elseif nr == 92 then
return '<Leader>'
elseif nr == 27 then
return '<Esc>'
else
return vim.fn.nr2char(nr)
end
else
return specified_keys[nr] or ''
end
end
return M return M

886
lua/spacevim/plugin/guide.lua
View File

File diff suppressed because it is too large Load Diff