diff options
| -rw-r--r-- | runtime/doc/gui.txt | 24 | ||||
| -rw-r--r-- | runtime/lua/vim/_defaults.lua | 30 | ||||
| -rw-r--r-- | runtime/plugin/nvim.lua | 24 | ||||
| -rw-r--r-- | test/functional/core/startup_spec.lua | 10 | ||||
| -rw-r--r-- | test/functional/helpers.lua | 4 | ||||
| -rw-r--r-- | test/old/testdir/setup.vim | 3 |
6 files changed, 46 insertions, 49 deletions
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index bf62dba539..a64d722177 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -443,18 +443,18 @@ You can define the special menu "PopUp". This is the menu that is displayed when the right mouse button is pressed, if 'mousemodel' is set to popup or popup_setpos. -The default "PopUp" menu is: > - aunmenu PopUp - vnoremenu PopUp.Cut "+x - vnoremenu PopUp.Copy "+y - anoremenu PopUp.Paste "+gP - vnoremenu PopUp.Paste "+P - vnoremenu PopUp.Delete "_x - nnoremenu PopUp.Select\ All ggVG - vnoremenu PopUp.Select\ All gg0oG$ - inoremenu PopUp.Select\ All <C-Home><C-O>VG - anoremenu PopUp.-1- <Nop> - anoremenu PopUp.How-to\ disable\ mouse <Cmd>help disable-mouse<CR> +The default "PopUp" menu is: >vim + vnoremenu PopUp.Cut "+x + vnoremenu PopUp.Copy "+y + anoremenu PopUp.Paste "+gP + vnoremenu PopUp.Paste "+P + vnoremenu PopUp.Delete "_x + nnoremenu PopUp.Select\ All ggVG + vnoremenu PopUp.Select\ All gg0oG$ + inoremenu PopUp.Select\ All <C-Home><C-O>VG + anoremenu PopUp.Inspect <Cmd>Inspect<CR> + anoremenu PopUp.-1- <Nop> + anoremenu PopUp.How-to\ disable\ mouse <Cmd>help disable-mouse<CR> < Showing What Menus Are Mapped To *showing-menus* diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua index 6223082622..0798ca8d16 100644 --- a/runtime/lua/vim/_defaults.lua +++ b/runtime/lua/vim/_defaults.lua @@ -1,3 +1,31 @@ +--- Default user commands +do + vim.api.nvim_create_user_command('Inspect', function(cmd) + if cmd.bang then + vim.print(vim.inspect_pos()) + else + vim.show_pos() + end + end, { desc = 'Inspect highlights and extmarks at the cursor', bang = true }) + + vim.api.nvim_create_user_command('InspectTree', function(cmd) + if cmd.mods ~= '' or cmd.count ~= 0 then + local count = cmd.count ~= 0 and cmd.count or '' + local new = cmd.mods ~= '' and 'new' or 'vnew' + + vim.treesitter.inspect_tree({ + command = ('%s %s%s'):format(cmd.mods, count, new), + }) + else + vim.treesitter.inspect_tree() + end + end, { desc = 'Inspect treesitter language tree for buffer', count = true }) + + vim.api.nvim_create_user_command('EditQuery', function(cmd) + vim.treesitter.query.edit(cmd.fargs[1]) + end, { desc = 'Edit treesitter query', nargs = '?' }) +end + --- Default mappings do --- Default maps for * and # in visual mode. @@ -93,7 +121,6 @@ do --- Right click popup menu -- TODO VimScript, no l10n vim.cmd([[ - aunmenu * vnoremenu PopUp.Cut "+x vnoremenu PopUp.Copy "+y anoremenu PopUp.Paste "+gP @@ -102,6 +129,7 @@ do nnoremenu PopUp.Select\ All ggVG vnoremenu PopUp.Select\ All gg0oG$ inoremenu PopUp.Select\ All <C-Home><C-O>VG + anoremenu PopUp.Inspect <Cmd>Inspect<CR> anoremenu PopUp.-1- <Nop> anoremenu PopUp.How-to\ disable\ mouse <Cmd>help disable-mouse<CR> ]]) diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua deleted file mode 100644 index 743d3044b6..0000000000 --- a/runtime/plugin/nvim.lua +++ /dev/null @@ -1,24 +0,0 @@ -vim.api.nvim_create_user_command('Inspect', function(cmd) - if cmd.bang then - vim.print(vim.inspect_pos()) - else - vim.show_pos() - end -end, { desc = 'Inspect highlights and extmarks at the cursor', bang = true }) - -vim.api.nvim_create_user_command('InspectTree', function(cmd) - if cmd.mods ~= '' or cmd.count ~= 0 then - local count = cmd.count ~= 0 and cmd.count or '' - local new = cmd.mods ~= '' and 'new' or 'vnew' - - vim.treesitter.inspect_tree({ - command = ('%s %s%s'):format(cmd.mods, count, new), - }) - else - vim.treesitter.inspect_tree() - end -end, { desc = 'Inspect treesitter language tree for buffer', count = true }) - -vim.api.nvim_create_user_command('EditQuery', function(cmd) - vim.treesitter.query.edit(cmd.fargs[1]) -end, { desc = 'Edit treesitter query', nargs = '?' }) diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua index adf29cbe7c..512b79acc5 100644 --- a/test/functional/core/startup_spec.lua +++ b/test/functional/core/startup_spec.lua @@ -101,15 +101,7 @@ describe('startup', function() VIMRUNTIME = os.getenv('VIMRUNTIME'), }, }) - screen:expect([[ - ^ | - | - Entering Debug mode. Type "cont" to continue. | - nvim_exec2() | - cmd: aunmenu * | - > | - | - ]]) + screen:expect({ any = pesc('Entering Debug mode. Type "cont" to continue.') }) fn.chansend(id, 'cont\n') screen:expect([[ ^ | diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index caa14a480b..e5b0819d12 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -37,9 +37,9 @@ module.nvim_argv = { runtime_set, '--cmd', module.nvim_set, - -- Remove default mappings. + -- Remove default user commands and mappings. '--cmd', - 'mapclear | mapclear!', + 'comclear | mapclear | mapclear!', -- Make screentest work after changing to the new default color scheme -- Source 'vim' color scheme without side effects -- TODO: rewrite tests diff --git a/test/old/testdir/setup.vim b/test/old/testdir/setup.vim index 091fb95806..a87903bc0d 100644 --- a/test/old/testdir/setup.vim +++ b/test/old/testdir/setup.vim @@ -44,7 +44,8 @@ if exists('s:did_load') endif let s:did_load = 1 -" Clear Nvim default mappings and menus. +" Clear Nvim default user commands, mappings and menus. +comclear mapclear mapclear! aunmenu * |