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

revert: "feat(mappings): do not simplify the rhs of a mapping" (#18553)

Browse Source 
This reverts commit 7ac5359143.
This fix can cause more problems than it solves.
This commit is contained in:
zeertzjq 2022-05-13 11:31:17 +08:00 committed by GitHub
parent 233c41cb8c
commit 030417d80b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/doc/vim_diff.txt
View File

@ -368,9 +368,8 @@ Macro/|recording| behavior
the results of keys from 'keymap'. the results of keys from 'keymap'.
Mappings: Mappings:
- Creating a mapping for a simplifiable key (e.g. <C-I>) doesn't replace an Creating a mapping for a simplifiable key (e.g. <C-I>) doesn't replace an
existing mapping for its simplified form (e.g. <Tab>). existing mapping for its simplified form (e.g. <Tab>).
- The rhs of a mapping is not simplified when it is defined.
Motion: Motion:
The |jumplist| avoids useless/phantom jumps. The |jumplist| avoids useless/phantom jumps.

4
src/nvim/getchar.c
View File

@ -2904,8 +2904,8 @@ void set_maparg_lhs_rhs(const char *const orig_lhs, const size_t orig_lhs_len,
mapargs->rhs_len = 0; mapargs->rhs_len = 0;
mapargs->rhs_is_noop = true; mapargs->rhs_is_noop = true;
} else { } else {
replaced = replace_termcodes(orig_rhs, orig_rhs_len, &rhs_buf, replaced = replace_termcodes(orig_rhs, orig_rhs_len, &rhs_buf, REPTERM_DO_LT, NULL,
REPTERM_DO_LT | REPTERM_NO_SIMPLIFY, NULL, cpo_flags); cpo_flags);
mapargs->rhs_len = STRLEN(replaced); mapargs->rhs_len = STRLEN(replaced);
// XXX: even when orig_rhs is non-empty, replace_termcodes may produce an empty string. // XXX: even when orig_rhs is non-empty, replace_termcodes may produce an empty string.
mapargs->rhs_is_noop = orig_rhs[0] != NUL && mapargs->rhs_len == 0; mapargs->rhs_is_noop = orig_rhs[0] != NUL && mapargs->rhs_len == 0;

5
test/functional/ui/input_spec.lua
View File

@ -313,11 +313,6 @@ it('unsimplified mapping works when there was a partial match vim-patch:8.2.4504
expect('xb') expect('xb')
end) end)
it('rhs of a mapping is not simplified', function()
command('nnoremap <Plug>foo <C-J>')
eq('<C-J>', funcs.maparg('<Plug>foo'))
end)
describe('input non-printable chars', function() describe('input non-printable chars', function()
after_each(function() after_each(function()
os.remove('Xtest-overwrite') os.remove('Xtest-overwrite')