From 62ba6e8a76f3b7ebce5df9cea162c9b4e62bc677 Mon Sep 17 00:00:00 2001
From: Yochem van Rosmalen <git@yochem.nl>
Date: Thu, 22 May 2025 12:40:08 +0200
Subject: [PATCH] fix: use nvim namespace convention #34010

---
 runtime/lua/vim/diagnostic.lua        | 2 +-
 runtime/lua/vim/lsp/diagnostic.lua    | 4 ++--
 runtime/plugin/shada.vim              | 2 +-
 test/functional/plugin/shada_spec.lua | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 7e0c4dd31a..e0f4008064 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -742,7 +742,7 @@ local registered_autocmds = {}
 
 local function make_augroup_key(namespace, bufnr)
   local ns = M.get_namespace(namespace)
-  return string.format('DiagnosticInsertLeave:%s:%s', bufnr, ns.name)
+  return string.format('nvim.diagnostic.insertleave.%s.%s', bufnr, ns.name)
 end
 
 --- @param namespace integer
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index af32255173..93dfbed779 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -189,7 +189,7 @@ function M.get_namespace(client_id, is_pull)
       vim.tbl_get((client or {}).server_capabilities, 'diagnosticProvider', 'identifier')
     local key = string.format('%d:%s', client_id, server_id or 'nil')
     local name = string.format(
-      'vim.lsp.%s.%d.%s',
+      'nvim.lsp.%s.%d.%s',
       client and client.name or 'unknown',
       client_id,
       server_id or 'nil'
@@ -201,7 +201,7 @@ function M.get_namespace(client_id, is_pull)
     end
     return ns
   else
-    local name = string.format('vim.lsp.%s.%d', client and client.name or 'unknown', client_id)
+    local name = string.format('nvim.lsp.%s.%d', client and client.name or 'unknown', client_id)
     local ns = _client_push_namespaces[client_id]
     if not ns then
       ns = api.nvim_create_namespace(name)
diff --git a/runtime/plugin/shada.vim b/runtime/plugin/shada.vim
index ae08e01dcb..5c7d93aaa0 100644
--- a/runtime/plugin/shada.vim
+++ b/runtime/plugin/shada.vim
@@ -3,7 +3,7 @@ if exists('g:loaded_shada_plugin')
 endif
 let g:loaded_shada_plugin = 1
 
-augroup ShaDaCommands
+augroup nvim.shada
   autocmd!
   autocmd BufReadCmd *.shada,*.shada.tmp.[a-z]
         \ :if !empty(v:cmdarg)|throw '++opt not supported'|endif
diff --git a/test/functional/plugin/shada_spec.lua b/test/functional/plugin/shada_spec.lua
index ca005d9f12..26af1a127a 100644
--- a/test/functional/plugin/shada_spec.lua
+++ b/test/functional/plugin/shada_spec.lua
@@ -2636,8 +2636,7 @@ describe('plugin/shada.vim', function()
     wshada('\004\000\009\147\000\196\002ab\196\001a')
     wshada_tmp('\004\000\009\147\000\196\002ab\196\001b')
 
-    local bufread_commands =
-      api.nvim_get_autocmds({ group = 'ShaDaCommands', event = 'BufReadCmd' })
+    local bufread_commands = api.nvim_get_autocmds({ group = 'nvim.shada', event = 'BufReadCmd' })
     eq(2, #bufread_commands--[[, vim.inspect(bufread_commands) ]])
 
     -- Need to set nohidden so that the buffer containing 'fname' is not unloaded