1 files changed, 59 insertions, 4 deletions
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 1342df529f..9a97e5db2f 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -208,6 +208,9 @@ local diagnostic_cache_lines = setmetatable({}, bufnr_and_client_cacher_mt)
 local diagnostic_cache_counts = setmetatable({}, bufnr_and_client_cacher_mt)
 local diagnostic_attached_buffers = {}
 
+-- Disabled buffers and clients
+local diagnostic_disabled = setmetatable({}, bufnr_and_client_cacher_mt)
+
 local _bufs_waiting_to_update = setmetatable({}, bufnr_and_client_cacher_mt)
 
 --- Store Diagnostic[] by line
@@ -816,10 +819,7 @@ end
 ---@param diagnostic_ns number|nil Associated diagnostic namespace
 ---@param sign_ns number|nil Associated sign namespace
 function M.clear(bufnr, client_id, diagnostic_ns, sign_ns)
-  validate { bufnr = { bufnr, 'n' } }
-
-  bufnr = (bufnr == 0 and api.nvim_get_current_buf()) or bufnr
-
+  bufnr = get_bufnr(bufnr)
   if client_id == nil then
     return vim.lsp.for_each_buffer_client(bufnr, function(_, iter_client_id, _)
       return M.clear(bufnr, iter_client_id)
@@ -1092,6 +1092,10 @@ end
 --@private
 --- Display diagnostics for the buffer, given a configuration.
 function M.display(diagnostics, bufnr, client_id, config)
+  if diagnostic_disabled[bufnr][client_id] then
+    return
+  end
+
   config = vim.lsp._with_extend('vim.lsp.diagnostic.on_publish_diagnostics', {
     signs = true,
     underline = true,
@@ -1282,6 +1286,57 @@ function M.set_loclist(opts)
     vim.cmd [[lopen]]
   end
 end
+
+--- Disable diagnostics for the given buffer and client
+--- @param bufnr (optional, number): Buffer handle, defaults to current
+--- @param client_id (optional, number): Disable diagnostics for the given
+---        client. The default is to disable diagnostics for all attached
+---        clients.
+-- Note that when diagnostics are disabled for a buffer, the server will still
+-- send diagnostic information and the client will still process it. The
+-- diagnostics are simply not displayed to the user.
+function M.disable(bufnr, client_id)
+  if not client_id then
+    return vim.lsp.for_each_buffer_client(bufnr, function(client)
+      M.disable(bufnr, client.id)
+    end)
+  end
+
+  diagnostic_disabled[bufnr][client_id] = true
+  M.clear(bufnr, client_id)
+end
+
+--- Enable diagnostics for the given buffer and client
+--- @param bufnr (optional, number): Buffer handle, defaults to current
+--- @param client_id (optional, number): Enable diagnostics for the given
+---        client. The default is to enable diagnostics for all attached
+---        clients.
+function M.enable(bufnr, client_id)
+  if not client_id then
+    return vim.lsp.for_each_buffer_client(bufnr, function(client)
+      M.enable(bufnr, client.id)
+    end)
+  end
+
+  if not diagnostic_disabled[bufnr][client_id] then
+    return
+  end
+
+  diagnostic_disabled[bufnr][client_id] = nil
+
+  -- We need to invoke the publishDiagnostics handler directly instead of just
+  -- calling M.display so that we can preserve any custom configuration options
+  -- the user may have set with vim.lsp.with.
+  vim.lsp.handlers["textDocument/publishDiagnostics"](
+    nil,
+    "textDocument/publishDiagnostics",
+    {
+      diagnostics = M.get(bufnr, client_id),
+      uri = vim.uri_from_bufnr(bufnr),
+    },
+    client_id
+  )
+end
 -- }}}
 
 return M