Add <Plug> mappings

neovim · Nov 8, 2021 · a30a07c · a30a07c
1 parent 34815c0
commit a30a07c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
@@ -85,8 +85,10 @@ of these in your config by simply removing the mapping, e.g. ":unmap Y".
 	nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<CR><C-L>
 	inoremap <C-U> <C-G>u<C-U>
 	inoremap <C-W> <C-G>u<C-W>
-	nnoremap ]g <Cmd>lua vim.diagnostic.goto_next {float=false}<CR>
-	nnoremap [g <Cmd>lua vim.diagnostic.goto_prev {float=false}<CR>
+	nmap ]g <Plug>(VimDiagnosticGotoNext)
+	nmap [g <Plug>(VimDiagnosticGotoPrev)
+	nmap ]G <Plug>(VimDiagnosticGotoLast)
+	nmap [G <Plug>(VimDiagnosticGotoFirst)
 <
 Default Autocommands ~
 							*default-autocmds*

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
@@ -845,8 +845,16 @@ void init_default_mappings(void)
   add_map((char_u *)"<C-L> <Cmd>nohlsearch<Bar>diffupdate<CR><C-L>", NORMAL, true);
   add_map((char_u *)"<C-U> <C-G>u<C-U>", INSERT, true);
   add_map((char_u *)"<C-W> <C-G>u<C-W>", INSERT, true);
-  add_map((char_u *)"]g <Cmd>lua vim.diagnostic.goto_next {float=false}<CR>", NORMAL, true);
-  add_map((char_u *)"[g <Cmd>lua vim.diagnostic.goto_prev {float=false}<CR>", NORMAL, true);
+
+  add_map((char_u *)"<Plug>(VimDiagnosticGotoNext) <Cmd>lua vim.diagnostic.goto_next {float=false}<CR>", NORMAL, true);
+  add_map((char_u *)"<Plug>(VimDiagnosticGotoPrev) <Cmd>lua vim.diagnostic.goto_prev {float=false}<CR>", NORMAL, true);
+  add_map((char_u *)"<Plug>(VimDiagnosticGotoLast) <Cmd>lua vim.diagnostic.goto_last {float=false}<CR>", NORMAL, true);
+  add_map((char_u *)"<Plug>(VimDiagnosticGotoFirst) <Cmd>lua vim.diagnostic.goto_first {float=false}<CR>", NORMAL, true);
+
+  add_map((char_u *)"]g <Plug>(VimDiagnosticGotoNext)", NORMAL, false);
+  add_map((char_u *)"[g <Plug>(VimDiagnosticGotoPrev)", NORMAL, false);
+  add_map((char_u *)"]G <Plug>(VimDiagnosticGotoLast)", NORMAL, false);
+  add_map((char_u *)"[G <Plug>(VimDiagnosticGotoFirst)", NORMAL, false);
 }
 
 // Insert a string in position 'offset' in the typeahead buffer (for "@r"