kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 11:15:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19141 from bfredl/mapchar

Browse Source 
refactor: define builtin mappings and autocmds without pseudo-excmds
This commit is contained in:
bfredl 2022-06-29 00:46:25 +02:00 committed by GitHub
commit 3cc8559963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/autocmd.c
View File

@ -2707,14 +2707,21 @@ static void do_autocmd_focusgained(bool gained)
recursive = false;
}
// initialization
static void define_autocmd(event_T event, char *pat, char *group, bool once, bool nested, char *cmd)
{
AucmdExecutable exec = AUCMD_EXECUTABLE_INIT;
exec.type = CALLABLE_EX;
exec.callable.cmd = cmd; // autocmd_register() makes a copy
int group_id = augroup_add(group);
autocmd_register(0, event, pat, (int)strlen(pat), group_id, once, nested, NULL, exec);
}
/// initialization of default autocmds
void init_default_autocmds(void)
{
// open terminals when opening files that start with term://
#define PROTO "term://"
do_cmdline_cmd("augroup nvim_terminal");
do_cmdline_cmd("autocmd BufReadCmd " PROTO "* ++nested "
define_autocmd(EVENT_BUFREADCMD, PROTO "*", "nvim_terminal", false, true,
"if !exists('b:term_title')|call termopen("
// Capture the command string
"matchstr(expand(\"<amatch>\"), "
@ -2723,11 +2730,8 @@ void init_default_autocmds(void)
"{'cwd': expand(get(matchlist(expand(\"<amatch>\"), "
"'\\c\\m" PROTO "\\(.\\{-}\\)//'), 1, ''))})"
"|endif");
do_cmdline_cmd("augroup END");
#undef PROTO
// limit syntax synchronization in the command window
do_cmdline_cmd("augroup nvim_cmdwin");
do_cmdline_cmd("autocmd! CmdwinEnter [:>] syntax sync minlines=1 maxlines=1");
do_cmdline_cmd("augroup END");
define_autocmd(EVENT_CMDWINENTER, "[:>]", "nvim_cmdwin", false, false,
"syntax sync minlines=1 maxlines=1");
}

4
src/nvim/ex_getln.c
View File

@ -6645,8 +6645,8 @@ static int open_cmdwin(void)
const int histtype = hist_char2type(cmdwin_type);
if (histtype == HIST_CMD || histtype == HIST_DEBUG) {
if (p_wc == TAB) {
add_map((char_u *)"<buffer> <Tab> <C-X><C-V>", MODE_INSERT, false);
add_map((char_u *)"<buffer> <Tab> a<C-X><C-V>", MODE_NORMAL, false);
add_map("<Tab>", "<C-X><C-V>", MODE_INSERT, true);
add_map("<Tab>", "a<C-X><C-V>", MODE_NORMAL, true);
}
set_option_value("ft", 0L, "vim", OPT_LOCAL);
}

38
src/nvim/mapping.c
View File

@ -2092,37 +2092,35 @@ void f_mapcheck(typval_T *argvars, typval_T *rettv, FunPtr fptr)
void init_default_mappings(void)
{
add_map((char_u *)"Y y$", MODE_NORMAL, true);
add_map("Y", "y$", MODE_NORMAL, false);
// Use normal! <C-L> to prevent inserting raw <C-L> when using i_<C-O>
// See https://github.com/neovim/neovim/issues/17473
add_map((char_u *)"<C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
MODE_NORMAL, true);
add_map((char_u *)"<C-U> <C-G>u<C-U>", MODE_INSERT, true);
add_map((char_u *)"<C-W> <C-G>u<C-W>", MODE_INSERT, true);
add_map((char_u *)"* y/\\\\V<C-R>\"<CR>", MODE_VISUAL, true);
add_map((char_u *)"# y?\\\\V<C-R>\"<CR>", MODE_VISUAL, true);
add_map("<C-L>", "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
MODE_NORMAL, false);
add_map("<C-U>", "<C-G>u<C-U>", MODE_INSERT, false);
add_map("<C-W>", "<C-G>u<C-W>", MODE_INSERT, false);
add_map("*", "y/\\\\V<C-R>\"<CR>", MODE_VISUAL, false);
add_map("#", "y?\\\\V<C-R>\"<CR>", MODE_VISUAL, false);
}
/// Add a mapping. Unlike @ref do_map this copies the {map} argument, so
/// Add a mapping. Unlike @ref do_map this copies the string arguments, so
/// static or read-only strings can be used.
///
/// @param map C-string containing the arguments of the map/abbrev command,
/// i.e. everything except the initial `:[X][nore]map`.
/// @param lhs C-string containing the lhs of the mapping
/// @param rhs C-string containing the rhs of the mapping
/// @param mode Bitflags representing the mode in which to set the mapping.
/// See @ref get_map_mode.
/// @param nore If true, make a non-recursive mapping.
void add_map(char_u *map, int mode, bool nore)
/// @param buffer If true, make a buffer-local mapping for curbuf
void add_map(char *lhs, char *rhs, int mode, bool buffer)
{
char_u *s;
char *cpo_save = p_cpo;
MapArguments args = { 0 };
set_maparg_lhs_rhs(lhs, strlen(lhs), rhs, strlen(rhs), LUA_NOREF, 0, &args);
args.buffer = buffer;
p_cpo = ""; // Allow <> notation
// Need to put string in allocated memory, because do_map() will modify it.
s = vim_strsave(map);
(void)do_map(nore ? 2 : 0, s, mode, false);
xfree(s);
p_cpo = cpo_save;
buf_do_map(2, &args, mode, false, curbuf);
xfree(args.rhs);
xfree(args.orig_rhs);
}
/// Any character has an equivalent 'langmap' character. This is used for

2
src/nvim/normal.c
View File

@ -4282,7 +4282,7 @@ static void nv_ident(cmdarg_T *cap)
// Start insert mode in terminal buffer
restart_edit = 'i';
add_map((char_u *)"<buffer> <esc> <Cmd>bdelete!<CR>", MODE_TERMINAL, true);
add_map("<esc>", "<Cmd>bdelete!<CR>", MODE_TERMINAL, true);
}
}

6
test/functional/core/startup_spec.lua
View File

@ -499,11 +499,11 @@ describe('sysinit', function()
[[" -u NONE -i NONE --cmd "set noruler" -D')]])
screen:expect([[
^ |
|
Entering Debug mode. Type "cont" to continue. |
cmd: augroup nvim_terminal |
pre-vimrc command line |
cmd: set noruler |
> |
<" -u NONE -i NONE --cmd "set noruler" -D 1,0-1 All|
<" -u NONE -i NONE --cmd "set noruler" -D 1,1 All|
|
]])
command([[call chansend(g:id, "cont\n")]])