Merge #32001 from MariaSolOs/consistent-namespaces

9 files changed, 19 insertions, 19 deletions

diff --git a/test/functional/editor/defaults_spec.lua b/test/functional/editor/defaults_spec.lua
index b62c5afcfc..ee6bfa1be9 100644
--- a/test/functional/editor/defaults_spec.lua
+++ b/test/functional/editor/defaults_spec.lua
@@ -32,7 +32,7 @@ describe('default', function()
   describe('popupmenu', function()
     it('can be disabled by user', function()
       n.clear {
-        args = { '+autocmd! nvim_popupmenu', '+aunmenu PopUp' },
+        args = { '+autocmd! nvim.popupmenu', '+aunmenu PopUp' },
       }
       local screen = Screen.new(40, 8)
       n.insert([[
diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
index d1f598a9d8..f84fc140d2 100644
--- a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
+++ b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
@@ -173,7 +173,7 @@ describe('swapfile detection', function()
     local screen2 = Screen.new(256, 40)
     screen2._default_attr_ids = nil
     exec(init)
-    command('autocmd! nvim_swapfile') -- Delete the default handler (which skips the dialog).
+    command('autocmd! nvim.swapfile') -- Delete the default handler (which skips the dialog).
 
     -- With shortmess+=F
     command('set shortmess+=F')
@@ -277,7 +277,7 @@ describe('swapfile detection', function()
     set_session(nvim1)
     screen:attach()
     exec(init)
-    command('autocmd! nvim_swapfile') -- Delete the default handler (which skips the dialog).
+    command('autocmd! nvim.swapfile') -- Delete the default handler (which skips the dialog).
     feed(':split Xfile1\n')
     -- The default SwapExists handler does _not_ skip this prompt.
     screen:expect({
@@ -296,7 +296,7 @@ describe('swapfile detection', function()
     set_session(nvim2)
     screen:attach()
     exec(init)
-    command('autocmd! nvim_swapfile') -- Delete the default handler (which skips the dialog).
+    command('autocmd! nvim.swapfile') -- Delete the default handler (which skips the dialog).
     command('set more')
     command('au bufadd * let foo_w = wincol()')
     feed(':e Xfile1<CR>')
@@ -327,7 +327,7 @@ describe('swapfile detection', function()
 
     exec(init)
     if not swapexists then
-      command('autocmd! nvim_swapfile') -- Delete the default handler (which skips the dialog).
+      command('autocmd! nvim.swapfile') -- Delete the default handler (which skips the dialog).
     end
     command('set nohidden')
 
diff --git a/test/functional/lua/hl_spec.lua b/test/functional/lua/hl_spec.lua
index 89881973bf..3f903d43a9 100644
--- a/test/functional/lua/hl_spec.lua
+++ b/test/functional/lua/hl_spec.lua
@@ -144,7 +144,7 @@ describe('vim.hl.on_yank', function()
       vim.api.nvim_buf_set_mark(0, ']', 1, 1, {})
       vim.hl.on_yank({ timeout = math.huge, on_macro = true, event = { operator = 'y' } })
     end)
-    local ns = api.nvim_create_namespace('hlyank')
+    local ns = api.nvim_create_namespace('nvim.hlyank')
     local win = api.nvim_get_current_win()
     eq({ win }, api.nvim__ns_get(ns).wins)
     command('wincmd w')
@@ -158,7 +158,7 @@ describe('vim.hl.on_yank', function()
       vim.api.nvim_buf_set_mark(0, ']', 1, 1, {})
       vim.hl.on_yank({ timeout = math.huge, on_macro = true, event = { operator = 'y' } })
     end)
-    local ns = api.nvim_create_namespace('hlyank')
+    local ns = api.nvim_create_namespace('nvim.hlyank')
     eq(api.nvim_get_current_win(), api.nvim__ns_get(ns).wins[1])
     command('wincmd w')
     exec_lua(function()
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index 50e23d9e23..66b75a4ea2 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -351,7 +351,7 @@ describe(':terminal buffer', function()
   end)
 
   it('TermRequest synchronization #27572', function()
-    command('autocmd! nvim_terminal TermRequest')
+    command('autocmd! nvim.terminal TermRequest')
     local term = exec_lua([[
       _G.input = {}
       local term = vim.api.nvim_open_term(0, {
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index 5224d322d3..c29a1e9cd4 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -176,7 +176,7 @@ local function test_terminal_with_fake_shell(backslash)
   end)
 
   it('with no argument, acts like jobstart(…,{term=true})', function()
-    command('autocmd! nvim_terminal TermClose')
+    command('autocmd! nvim.terminal TermClose')
     feed_command('terminal')
     screen:expect([[
       ^ready $                                           |
@@ -246,7 +246,7 @@ local function test_terminal_with_fake_shell(backslash)
   end)
 
   it('ignores writes if the backing stream closes', function()
-    command('autocmd! nvim_terminal TermClose')
+    command('autocmd! nvim.terminal TermClose')
     feed_command('terminal')
     feed('iiXXXXXXX')
     poke_eventloop()
@@ -258,14 +258,14 @@ local function test_terminal_with_fake_shell(backslash)
   end)
 
   it('works with findfile()', function()
-    command('autocmd! nvim_terminal TermClose')
+    command('autocmd! nvim.terminal TermClose')
     feed_command('terminal')
     eq('term://', string.match(eval('bufname("%")'), '^term://'))
     eq('scripts/shadacat.py', eval('findfile("scripts/shadacat.py", ".")'))
   end)
 
   it('works with :find', function()
-    command('autocmd! nvim_terminal TermClose')
+    command('autocmd! nvim.terminal TermClose')
     feed_command('terminal')
     screen:expect([[
       ^ready $                                           |
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 0a7dca8e6e..a2dc3c500f 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -644,7 +644,7 @@ describe('TUI', function()
 
       aunmenu PopUp
       " Delete the default MenuPopup event handler.
-      autocmd! nvim_popupmenu
+      autocmd! nvim.popupmenu
       menu PopUp.foo :let g:menustr = 'foo'<CR>
       menu PopUp.bar :let g:menustr = 'bar'<CR>
       menu PopUp.baz :let g:menustr = 'baz'<CR>
diff --git a/test/functional/ui/multigrid_spec.lua b/test/functional/ui/multigrid_spec.lua
index 3afda0c4af..cac7174cb6 100644
--- a/test/functional/ui/multigrid_spec.lua
+++ b/test/functional/ui/multigrid_spec.lua
@@ -1094,7 +1094,7 @@ describe('ext_multigrid', function()
   end)
 
   it('supports mouse', function()
-    command('autocmd! nvim_popupmenu') -- Delete the default MenuPopup event handler.
+    command('autocmd! nvim.popupmenu') -- Delete the default MenuPopup event handler.
     insert('some text\nto be clicked')
     screen:expect{grid=[[
     ## grid 1
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index 5e883d1a92..4c5b1d2bd2 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -841,7 +841,7 @@ describe('ui/ext_popupmenu', function()
 
       aunmenu PopUp
       " Delete the default MenuPopup event handler.
-      autocmd! nvim_popupmenu
+      autocmd! nvim.popupmenu
       menu PopUp.foo :let g:menustr = 'foo'<CR>
       menu PopUp.bar :let g:menustr = 'bar'<CR>
       menu PopUp.baz :let g:menustr = 'baz'<CR>
@@ -4089,7 +4089,7 @@ describe('builtin popupmenu', function()
         set mouse=a mousemodel=popup
 
         " Delete the default MenuPopup event handler.
-        autocmd! nvim_popupmenu
+        autocmd! nvim.popupmenu
         aunmenu PopUp
         menu PopUp.foo :let g:menustr = 'foo'<CR>
         menu PopUp.bar :let g:menustr = 'bar'<CR>
@@ -4946,7 +4946,7 @@ describe('builtin popupmenu', function()
       it(':popup command', function()
         exec([[
           " Delete the default MenuPopup event handler.
-          autocmd! nvim_popupmenu
+          autocmd! nvim.popupmenu
 
           func ChangeMenu()
             aunmenu PopUp.&Paste
@@ -5106,7 +5106,7 @@ describe('builtin popupmenu', function()
         exec([[
           set mousemodel=popup_setpos
           " Delete the default MenuPopup event handler.
-          autocmd! nvim_popupmenu
+          autocmd! nvim.popupmenu
           aunmenu *
           source $VIMRUNTIME/menu.vim
           call setline(1, join(range(20)))
diff --git a/test/old/testdir/setup.vim b/test/old/testdir/setup.vim
index b104d733f0..61596fc83a 100644
--- a/test/old/testdir/setup.vim
+++ b/test/old/testdir/setup.vim
@@ -65,7 +65,7 @@ mapclear
 mapclear!
 aunmenu *
 tlunmenu *
-autocmd! nvim_popupmenu
+autocmd! nvim.popupmenu
 
 " Undo the 'grepprg' and 'grepformat' setting in _defaults.lua.
 set grepprg& grepformat&