backport: refactor: update usages of deprecated "buffer" param #39090

runtime/lua/vim/_core/defaults.lua

@@ -617,7 +617,7 @@ do
         -- TermClose may be queued before TermOpen if process exits before `terminal_open` is called.
         -- Don't display the msg now, let TermOpen display it.
         vim.api.nvim_create_autocmd('TermOpen', {
-          buffer = ev.buf,
+          buf = ev.buf,
           once = true,
           callback = function()
             set_terminal_exitmsg(ev.buf, msg, pos)

runtime/lua/vim/health/health.lua

@@ -693,7 +693,7 @@ local function check_sysinfo()
         '%#WarningMsg#%@v:lua.nvim_health_bugreport_open@Click to Create Bug Report on GitHub%X%*'
 
       vim.api.nvim_create_autocmd('BufDelete', {
-        buffer = buf,
+        buf = buf,
         once = true,
         command = 'lua _G.nvim_health_bugreport_open = nil',
       })

runtime/lua/vim/lsp/inline_completion.lua

@@ -80,14 +80,14 @@ function Completor:new(bufnr)
   self.client_state = {}
   api.nvim_create_autocmd({ 'InsertEnter', 'CursorMovedI', 'TextChangedP' }, {
     group = self.augroup,
-    buffer = bufnr,
+    buf = bufnr,
     callback = function()
       self:automatic_request()
     end,
   })
   api.nvim_create_autocmd({ 'InsertLeave' }, {
     group = self.augroup,
-    buffer = bufnr,
+    buf = bufnr,
     callback = function()
       self:abort()
     end,

runtime/lua/vim/lsp/on_type_formatting.lua

@@ -116,7 +116,7 @@ local function detach(client, bufnr)
   -- Remove the buf handle and its autocmds if we removed its last client.
   if not next(buf_handle) then
     buf_handles[bufnr] = nil
-    api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+    api.nvim_clear_autocmds({ group = augroup, buf = bufnr })
 
     -- Remove the on_key callback if we removed the last buf handle.
     if not next(buf_handles) then
@@ -156,9 +156,9 @@ local function attach(client, bufnr)
     trigger[client_id] = client
   end
 
-  api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+  api.nvim_clear_autocmds({ group = augroup, buf = bufnr })
   api.nvim_create_autocmd('LspDetach', {
-    buffer = bufnr,
+    buf = bufnr,
     desc = 'Detach on-type formatting module when the client detaches',
     group = augroup,
     callback = function(ev)

test/functional/core/channels_spec.lua

@@ -430,7 +430,7 @@ describe('channels', function()
         end,
       })
       vim.api.nvim_create_autocmd('InsertEnter', {
-        buffer = 0,
+        buf = 0,
         callback = function()
           local chan = vim.fn.jobstart({ 'cat' })
           _G.result = vim.wait(3000, function()
@@ -453,7 +453,7 @@ describe('channels', function()
         end,
       })
       vim.api.nvim_create_autocmd('InsertEnter', {
-        buffer = 0,
+        buf = 0,
         callback = function()
           local chan = vim.fn.jobstart({ 'cat' })
           _G.result = vim.wait(3000, function()

test/functional/lua/buffer_updates_spec.lua

@@ -1819,7 +1819,7 @@ describe('nvim_buf_attach on_detach', function()
       _G.events = {}
       vim.api.nvim_buf_attach(1, false, { on_detach = _G.on_detach })
       vim.api.nvim_create_autocmd('BufUnload', {
-        buffer = 1,
+        buf = 1,
         once = true,
         callback = function()
           vim.api.nvim_buf_attach(1, false, {
@@ -1892,7 +1892,7 @@ it('nvim_buf_attach from buf_freeall autocommands does not leak', function()
   exec_lua(function()
     local b = vim.api.nvim_create_buf(true, true)
     vim.api.nvim_create_autocmd('BufWipeout', {
-      buffer = b,
+      buf = b,
       once = true,
       callback = function()
         vim.api.nvim_buf_attach(b, false, {})

test/functional/lua/diagnostic_spec.lua

@@ -2353,7 +2353,7 @@ describe('vim.diagnostic', function()
         })
 
         vim.api.nvim_buf_set_lines(_G.diagnostic_bufnr, 2, 5, false, {})
-        vim.api.nvim_exec_autocmds('CursorMoved', { buffer = _G.diagnostic_bufnr })
+        vim.api.nvim_exec_autocmds('CursorMoved', { buf = _G.diagnostic_bufnr })
         return _G.get_virt_text_extmarks(_G.diagnostic_ns)
       end)
 
@@ -2878,7 +2878,7 @@ describe('vim.diagnostic', function()
       local result = exec_lua(function()
         local changed_diags --- @type vim.Diagnostic[]?
         vim.api.nvim_create_autocmd('DiagnosticChanged', {
-          buffer = _G.diagnostic_bufnr,
+          buf = _G.diagnostic_bufnr,
           callback = function(ev)
             --- @type vim.Diagnostic[]
             changed_diags = ev.data.diagnostics

test/functional/plugin/lsp/diagnostic_spec.lua

@@ -673,7 +673,7 @@ describe('vim.lsp.diagnostic', function()
             bufnr = diagnostic_bufnr,
           })
           vim.api.nvim_exec_autocmds('LspNotify', {
-            buffer = diagnostic_bufnr,
+            buf = diagnostic_bufnr,
             data = {
               method = 'textDocument/didChange',
               client_id = client_id,
@@ -699,7 +699,7 @@ describe('vim.lsp.diagnostic', function()
             bufnr = diagnostic_bufnr,
           })
           vim.api.nvim_exec_autocmds('LspNotify', {
-            buffer = diagnostic_bufnr,
+            buf = diagnostic_bufnr,
             data = {
               method = 'textDocument/didChange',
               client_id = client_id,
@@ -746,7 +746,7 @@ describe('vim.lsp.diagnostic', function()
         }, {})
 
         vim.api.nvim_exec_autocmds('LspNotify', {
-          buffer = second_buf,
+          buf = second_buf,
           data = {
             method = 'textDocument/didChange',
             client_id = client_id,

test/functional/plugin/lsp_spec.lua

@@ -583,13 +583,13 @@ describe('LSP', function()
         local detach_called1 = false
         local detach_called2 = false
         vim.api.nvim_create_autocmd('LspDetach', {
-          buffer = bufnr1,
+          buf = bufnr1,
           callback = function()
             detach_called1 = true
           end,
         })
         vim.api.nvim_create_autocmd('LspDetach', {
-          buffer = bufnr2,
+          buf = bufnr2,
           callback = function()
             detach_called2 = true
           end,
@@ -806,7 +806,7 @@ describe('LSP', function()
             exec_lua(function()
               _G.BUFFER = vim.api.nvim_get_current_buf()
               vim.lsp.buf_attach_client(_G.BUFFER, _G.TEST_RPC_CLIENT_ID)
-              vim.api.nvim_exec_autocmds('BufWritePost', { buffer = _G.BUFFER, modeline = false })
+              vim.api.nvim_exec_autocmds('BufWritePost', { buf = _G.BUFFER, modeline = false })
             end)
           else
             client:stop()
@@ -856,7 +856,7 @@ describe('LSP', function()
         })
         local client_id = assert(vim.lsp.start({ name = 'dummy', cmd = server.cmd }))
         local buf = vim.api.nvim_get_current_buf()
-        vim.api.nvim_exec_autocmds('BufWritePre', { buffer = buf, modeline = false })
+        vim.api.nvim_exec_autocmds('BufWritePre', { buf = buf, modeline = false })
         vim.lsp.get_client_by_id(client_id):stop()
         return server.messages
       end)
@@ -892,7 +892,7 @@ describe('LSP', function()
         })
         local buf = vim.api.nvim_get_current_buf()
         local client_id = assert(vim.lsp.start({ name = 'dummy', cmd = server.cmd }))
-        vim.api.nvim_exec_autocmds('BufWritePre', { buffer = buf, modeline = false })
+        vim.api.nvim_exec_autocmds('BufWritePre', { buf = buf, modeline = false })
         vim.lsp.get_client_by_id(client_id):stop()
         return {
           messages = server.messages,
@@ -963,7 +963,7 @@ describe('LSP', function()
               _G.BUFFER = vim.api.nvim_get_current_buf()
               vim.api.nvim_buf_set_lines(_G.BUFFER, 0, -1, true, { 'help me' })
               vim.lsp.buf_attach_client(_G.BUFFER, _G.TEST_RPC_CLIENT_ID)
-              vim.api.nvim_exec_autocmds('BufWritePost', { buffer = _G.BUFFER, modeline = false })
+              vim.api.nvim_exec_autocmds('BufWritePost', { buf = _G.BUFFER, modeline = false })
             end)
           else
             client:stop()
@@ -6691,7 +6691,7 @@ describe('LSP', function()
 
         -- Exercise the codepath which had a regression:
         vim.lsp.enable('test_ls')
-        vim.api.nvim_exec_autocmds('FileType', { buffer = bufnr })
+        vim.api.nvim_exec_autocmds('FileType', { buf = bufnr })
 
         -- enable() does _not_ detach the client since it doesn't actually have a config.
         -- XXX: otoh, is it confusing to allow `enable("foo")` if there a "foo" _client_ without a "foo" _config_?

test/functional/terminal/buffer_spec.lua

@@ -728,14 +728,14 @@ describe(':terminal buffer', function()
       exec_lua([[
         local term = vim.api.nvim_open_term(0, {})
         vim.api.nvim_create_autocmd('TermRequest', {
-          buffer = 0,
+          buf = 0,
           callback = function(ev)
             _G.sequence = ev.data.sequence
             _G.v_termrequest = vim.v.termrequest
           end,
         })
         vim.api.nvim_create_autocmd('TermEnter', {
-          buffer = 0,
+          buf = 0,
           callback = function()
             vim.api.nvim_chan_send(term, '\027]11;?\027\\')
             _G.result = vim.wait(3000, function()

test/functional/terminal/tui_spec.lua

@@ -2771,7 +2771,7 @@ describe('TUI', function()
       local buf = vim.api.nvim_get_current_buf()
       _G.urls = {}
       vim.api.nvim_create_autocmd('TermRequest', {
-        buffer = buf,
+        buf = buf,
         callback = function(ev)
           local req = ev.data.sequence
           if not req then
@@ -2820,7 +2820,7 @@ describe('TUI', function()
         end,
       })
       vim.api.nvim_create_autocmd('InsertEnter', {
-        buffer = 0,
+        buf = 0,
         callback = function()
           _G.result = vim.wait(3000, function()
             local expected = '\027P1+r5463'