IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10628 from notomo/vim-8.1.1759

Browse Source
This commit is contained in:
Justin M. Keyes 2019-07-28 11:15:30 +02:00 committed by GitHub
commit b5c44b66eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/nvim/getchar.c
View File

@ -3288,29 +3288,36 @@ char *map_mode_to_chars(int mode)
ga_init(&mapmode, 1, 7);
if ((mode & (INSERT + CMDLINE)) == INSERT + CMDLINE)
ga_append(&mapmode, '!'); /* :map! */
else if (mode & INSERT)
ga_append(&mapmode, 'i'); /* :imap */
else if (mode & LANGMAP)
ga_append(&mapmode, 'l'); /* :lmap */
else if (mode & CMDLINE)
ga_append(&mapmode, 'c'); /* :cmap */
else if ((mode & (NORMAL + VISUAL + SELECTMODE + OP_PENDING))
== NORMAL + VISUAL + SELECTMODE + OP_PENDING)
ga_append(&mapmode, ' '); /* :map */
else {
if (mode & NORMAL)
ga_append(&mapmode, 'n'); /* :nmap */
if (mode & OP_PENDING)
ga_append(&mapmode, 'o'); /* :omap */
if ((mode & (VISUAL + SELECTMODE)) == VISUAL + SELECTMODE)
ga_append(&mapmode, 'v'); /* :vmap */
else {
if (mode & VISUAL)
ga_append(&mapmode, 'x'); /* :xmap */
if (mode & SELECTMODE)
ga_append(&mapmode, 's'); /* :smap */
if ((mode & (INSERT + CMDLINE)) == INSERT + CMDLINE) {
ga_append(&mapmode, '!'); // :map!
} else if (mode & INSERT) {
ga_append(&mapmode, 'i'); // :imap
} else if (mode & LANGMAP) {
ga_append(&mapmode, 'l'); // :lmap
} else if (mode & CMDLINE) {
ga_append(&mapmode, 'c'); // :cmap
} else if ((mode & (NORMAL + VISUAL + SELECTMODE + OP_PENDING))
== NORMAL + VISUAL + SELECTMODE + OP_PENDING) {
ga_append(&mapmode, ' '); // :map
} else {
if (mode & NORMAL) {
ga_append(&mapmode, 'n'); // :nmap
}
if (mode & OP_PENDING) {
ga_append(&mapmode, 'o'); // :omap
}
if (mode & TERM_FOCUS) {
ga_append(&mapmode, 't'); // :tmap
}
if ((mode & (VISUAL + SELECTMODE)) == VISUAL + SELECTMODE) {
ga_append(&mapmode, 'v'); // :vmap
} else {
if (mode & VISUAL) {
ga_append(&mapmode, 'x'); // :xmap
}
if (mode & SELECTMODE) {
ga_append(&mapmode, 's'); // :smap
}
}
}

4
src/nvim/testdir/test_maparg.vim
View File

@ -27,6 +27,10 @@ function Test_maparg()
call assert_equal({'silent': 0, 'noremap': 0, 'lhs': 'foo', 'mode': ' ',
\ 'nowait': 1, 'expr': 0, 'sid': sid, 'rhs': 'bar', 'buffer': 1},
\ maparg('foo', '', 0, 1))
tmap baz foo
call assert_equal({'silent': 0, 'noremap': 0, 'lhs': 'baz', 'mode': 't',
\ 'nowait': 0, 'expr': 0, 'sid': sid, 'rhs': 'foo', 'buffer': 0},
\ maparg('baz', 't', 0, 1))
map abc x<char-114>x
call assert_equal("xrx", maparg('abc'))

5
test/functional/api/keymap_spec.lua
View File

@ -346,11 +346,6 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
to_return.sid = not opts.sid and 0 or opts.sid
to_return.buffer = not opts.buffer and 0 or opts.buffer
-- mode 't' doesn't print when calling maparg
if mode == 't' then
to_return.mode = ''
end
return to_return
end