From 1da0f3494eb042c84ae5f00654878f7f8cedf3b7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 11 Mar 2024 22:23:14 +0800
Subject: test: correct order of arguments to eq() (#27816)

---
 test/functional/lua/diagnostic_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 5802925339..716c1e0f30 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -205,7 +205,7 @@ describe('vim.diagnostic', function()
       diag[1].col = 10000
       return vim.diagnostic.get()[1].col == 10000
     ]]
-    eq(result, false)
+    eq(false, result)
   end)
 
   it('resolves buffer number 0 to the current buffer', function()
-- 
cgit 


From e016f5bee6293d126fde9e8d75a3f02f882e2c81 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Tue, 2 Apr 2024 15:45:19 +0200
Subject: test: reduce `exec_lua` calls

`exec_lua` makes code slighly harder to read, so it's beneficial to
remove it in cases where it's possible or convenient.

Not all `exec_lua` calls should be removed even if the test passes as it
changes the semantics of the test even if it happens to pass.

From https://github.com/neovim/neovim/pull/28155#discussion_r1548185779:

"Note for tests like this, which fundamentally are about conversion, you
end up changing what conversion you are testing. Even if the result
happens to be same (as they often are, as we like the rules to be
consistent if possible), you are now testing the RPC conversion rules
instead of the vim script to in-process lua conversion rules."

From https://github.com/neovim/neovim/pull/28155#discussion_r1548190152:

"A test like this specifies that the cursor is valid immediately and not
after a separate cycle of normal (or an other input-processing) mode."
---
 test/functional/lua/diagnostic_spec.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 716c1e0f30..f648c0b215 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -8,6 +8,7 @@ local eq = helpers.eq
 local matches = helpers.matches
 local api = helpers.api
 local pcall_err = helpers.pcall_err
+local fn = helpers.fn
 
 describe('vim.diagnostic', function()
   before_each(function()
@@ -109,7 +110,7 @@ describe('vim.diagnostic', function()
       'DiagnosticVirtualTextOk',
       'DiagnosticVirtualTextWarn',
       'DiagnosticWarn',
-    }, exec_lua([[return vim.fn.getcompletion('Diagnostic', 'highlight')]]))
+    }, fn.getcompletion('Diagnostic', 'highlight'))
   end)
 
   it('retrieves diagnostics from all buffers and namespaces', function()
-- 
cgit 


From 7035125b2b26aa68fcfb7cda39377ac79926a0f9 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Mon, 8 Apr 2024 11:03:20 +0200
Subject: test: improve test conventions

Work on https://github.com/neovim/neovim/issues/27004.
---
 test/functional/lua/diagnostic_spec.lua | 36 +++++++++++++--------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index f648c0b215..152258dd8c 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -1,14 +1,14 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 
 local NIL = vim.NIL
-local command = helpers.command
-local clear = helpers.clear
-local exec_lua = helpers.exec_lua
-local eq = helpers.eq
-local matches = helpers.matches
-local api = helpers.api
-local pcall_err = helpers.pcall_err
-local fn = helpers.fn
+local command = t.command
+local clear = t.clear
+local exec_lua = t.exec_lua
+local eq = t.eq
+local matches = t.matches
+local api = t.api
+local pcall_err = t.pcall_err
+local fn = t.fn
 
 describe('vim.diagnostic', function()
   before_each(function()
@@ -1826,20 +1826,12 @@ describe('vim.diagnostic', function()
 
     it('respects legacy signs placed with :sign define or sign_define #26618', function()
       -- Legacy signs for diagnostics were deprecated in 0.10 and will be removed in 0.12
-      eq(0, helpers.fn.has('nvim-0.12'))
+      eq(0, t.fn.has('nvim-0.12'))
 
-      helpers.command(
-        'sign define DiagnosticSignError text= texthl= linehl=ErrorMsg numhl=ErrorMsg'
-      )
-      helpers.command(
-        'sign define DiagnosticSignWarn text= texthl= linehl=WarningMsg numhl=WarningMsg'
-      )
-      helpers.command(
-        'sign define DiagnosticSignInfo text= texthl= linehl=Underlined numhl=Underlined'
-      )
-      helpers.command(
-        'sign define DiagnosticSignHint text= texthl= linehl=Underlined numhl=Underlined'
-      )
+      t.command('sign define DiagnosticSignError text= texthl= linehl=ErrorMsg numhl=ErrorMsg')
+      t.command('sign define DiagnosticSignWarn text= texthl= linehl=WarningMsg numhl=WarningMsg')
+      t.command('sign define DiagnosticSignInfo text= texthl= linehl=Underlined numhl=Underlined')
+      t.command('sign define DiagnosticSignHint text= texthl= linehl=Underlined numhl=Underlined')
 
       local result = exec_lua [[
         vim.diagnostic.config({
-- 
cgit 


From 81fc27124b9e1b375e0ce9605ae69c3c2a2d9222 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 9 Apr 2024 12:26:16 +0100
Subject: refactor(test): inject after_each differently

---
 test/functional/lua/diagnostic_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 152258dd8c..afdf619526 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.functional.testutil')(after_each)
+local t = require('test.functional.testutil')()
 
 local NIL = vim.NIL
 local command = t.command
-- 
cgit 


From 26765e8461c1ba1e9a351632212cf89900221781 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 8 Apr 2024 00:41:41 +0200
Subject: feat(diagnostic): is_enabled, enable(…, enable:boolean)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
`vim.diagnostic.is_disabled` and `vim.diagnostic.disable` are unnecessary
and inconsistent with the "toggle" pattern (established starting with
`vim.lsp.inlay_hint`, see https://github.com/neovim/neovim/pull/25512#pullrequestreview-1676750276

As a reminder, the rationale is:
- we always need `enable()`
- we always end up needing `is_enabled()`
- "toggle" can be achieved via `enable(not is_enabled())`
- therefore,
    - `toggle()` and `disable()` are redundant
    - `is_disabled()` is a needless inconsistency

Solution:
- Introduce `vim.diagnostic.is_enabled`, and `vim.diagnostic.enable(…, enable:boolean)`
    - Note: Future improvement would be to add an `enable()` overload `enable(enable:boolean, opts: table)`.
- Deprecate `vim.diagnostic.is_disabled`, `vim.diagnostic.disable`
---
 test/functional/lua/diagnostic_spec.lua | 58 +++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 13 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index afdf619526..972e2baa71 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -329,7 +329,7 @@ describe('vim.diagnostic', function()
     eq(
       { 1, 1, 2, 0, 2 },
       exec_lua [[
-      vim.diagnostic.disable(diagnostic_bufnr, diagnostic_ns)
+      vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
       return {
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.ERROR, diagnostic_ns),
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.WARN, other_ns),
@@ -371,7 +371,7 @@ describe('vim.diagnostic', function()
       vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, ns_1_diags)
       vim.diagnostic.set(other_ns, diagnostic_bufnr, ns_2_diags)
 
-      vim.diagnostic.disable(diagnostic_bufnr, diagnostic_ns)
+      vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
 
       return {
         count_extmarks(diagnostic_bufnr, diagnostic_ns),
@@ -384,7 +384,7 @@ describe('vim.diagnostic', function()
       { 4, 0 },
       exec_lua [[
       vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns)
-      vim.diagnostic.disable(diagnostic_bufnr, other_ns)
+      vim.diagnostic.enable(diagnostic_bufnr, other_ns, false)
 
       return {
         count_extmarks(diagnostic_bufnr, diagnostic_ns),
@@ -500,7 +500,7 @@ describe('vim.diagnostic', function()
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.disable()
+        vim.diagnostic.enable(nil, nil, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
@@ -561,7 +561,7 @@ describe('vim.diagnostic', function()
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.disable(diagnostic_bufnr)
+        vim.diagnostic.enable(diagnostic_bufnr, nil, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
@@ -573,7 +573,7 @@ describe('vim.diagnostic', function()
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.disable(other_bufnr)
+        vim.diagnostic.enable(other_bufnr, nil, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
@@ -610,7 +610,7 @@ describe('vim.diagnostic', function()
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.disable(nil, diagnostic_ns)
+        vim.diagnostic.enable(nil, diagnostic_ns, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
@@ -620,7 +620,7 @@ describe('vim.diagnostic', function()
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.disable(nil, other_ns)
+        vim.diagnostic.enable(nil, other_ns, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
@@ -663,13 +663,13 @@ describe('vim.diagnostic', function()
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.disable(diagnostic_bufnr, diagnostic_ns)
+        vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.disable(diagnostic_bufnr, other_ns)
+        vim.diagnostic.enable(diagnostic_bufnr, other_ns, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
@@ -682,7 +682,7 @@ describe('vim.diagnostic', function()
                              count_extmarks(other_bufnr, diagnostic_ns))
 
         -- Should have no effect
-        vim.diagnostic.disable(other_bufnr, other_ns)
+        vim.diagnostic.enable(other_bufnr, other_ns, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
@@ -1742,7 +1742,7 @@ describe('vim.diagnostic', function()
       eq(
         0,
         exec_lua [[
-        vim.diagnostic.disable(diagnostic_bufnr, diagnostic_ns)
+        vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
         vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
           make_error('Diagnostic From Server 1:1', 1, 1, 1, 1),
         })
@@ -2711,7 +2711,39 @@ describe('vim.diagnostic', function()
       )
     end)
 
-    it('checks if diagnostics are disabled in a buffer', function()
+    it('is_enabled', function()
+      eq(
+        { false, false, false, false },
+        exec_lua [[
+        vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
+          make_error('Diagnostic #1', 1, 1, 1, 1),
+        })
+        vim.api.nvim_set_current_buf(diagnostic_bufnr)
+        vim.diagnostic.enable(nil, nil, false)
+        return {
+          vim.diagnostic.is_enabled(),
+          vim.diagnostic.is_enabled(diagnostic_bufnr),
+          vim.diagnostic.is_enabled(diagnostic_bufnr, diagnostic_ns),
+          vim.diagnostic.is_enabled(_, diagnostic_ns),
+        }
+      ]]
+      )
+
+      eq(
+        { true, true, true, true },
+        exec_lua [[
+        vim.diagnostic.enable()
+        return {
+          vim.diagnostic.is_enabled(),
+          vim.diagnostic.is_enabled(diagnostic_bufnr),
+          vim.diagnostic.is_enabled(diagnostic_bufnr, diagnostic_ns),
+          vim.diagnostic.is_enabled(_, diagnostic_ns),
+        }
+      ]]
+      )
+    end)
+
+    it('is_disabled (deprecated)', function()
       eq(
         { true, true, true, true },
         exec_lua [[
-- 
cgit 


From 5ed9916a28b9a09d2e5629f3e4e5b0e81403ded7 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 15 Apr 2024 18:35:59 +0200
Subject: feat(diagnostic): enable(…, opts)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
vim.diagnostic.enable() does not match the signature of vim.lsp.inlay_hint.enable()

Solution:
- Change the signature so that the first 2 args are (bufnr, enable).
- Introduce a 3rd `opts` arg.
    - Currently it only supports `opts.ns_id`.
---
 test/functional/lua/diagnostic_spec.lua | 87 +++++++++++++++++++++++----------
 1 file changed, 62 insertions(+), 25 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 972e2baa71..1a87d159c7 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -329,7 +329,7 @@ describe('vim.diagnostic', function()
     eq(
       { 1, 1, 2, 0, 2 },
       exec_lua [[
-      vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
+      vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
       return {
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.ERROR, diagnostic_ns),
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.WARN, other_ns),
@@ -344,7 +344,7 @@ describe('vim.diagnostic', function()
     eq(
       all_highlights,
       exec_lua([[
-      vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns)
+      vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
       return {
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.ERROR, diagnostic_ns),
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.WARN, other_ns),
@@ -371,7 +371,7 @@ describe('vim.diagnostic', function()
       vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, ns_1_diags)
       vim.diagnostic.set(other_ns, diagnostic_bufnr, ns_2_diags)
 
-      vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
+      vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
 
       return {
         count_extmarks(diagnostic_bufnr, diagnostic_ns),
@@ -383,8 +383,8 @@ describe('vim.diagnostic', function()
     eq(
       { 4, 0 },
       exec_lua [[
-      vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns)
-      vim.diagnostic.enable(diagnostic_bufnr, other_ns, false)
+      vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
+      vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = other_ns })
 
       return {
         count_extmarks(diagnostic_bufnr, diagnostic_ns),
@@ -478,7 +478,7 @@ describe('vim.diagnostic', function()
   end)
 
   describe('enable() and disable()', function()
-    it('works without arguments', function()
+    it('without arguments', function()
       local result = exec_lua [[
         vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
 
@@ -500,7 +500,7 @@ describe('vim.diagnostic', function()
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, nil, false)
+        vim.diagnostic.enable(nil, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
@@ -532,7 +532,7 @@ describe('vim.diagnostic', function()
       eq(4, result[4])
     end)
 
-    it('works with only a buffer argument', function()
+    it('with buffer argument', function()
       local result = exec_lua [[
         local other_bufnr = vim.api.nvim_create_buf(true, false)
 
@@ -561,7 +561,7 @@ describe('vim.diagnostic', function()
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(diagnostic_bufnr, nil, false)
+        vim.diagnostic.enable(diagnostic_bufnr, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
@@ -573,7 +573,7 @@ describe('vim.diagnostic', function()
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(other_bufnr, nil, false)
+        vim.diagnostic.enable(other_bufnr, false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
@@ -588,7 +588,7 @@ describe('vim.diagnostic', function()
       eq(3, result[4])
     end)
 
-    it('works with only a namespace argument', function()
+    it('with a namespace argument', function()
       local result = exec_lua [[
         vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
 
@@ -610,17 +610,17 @@ describe('vim.diagnostic', function()
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, diagnostic_ns, false)
+        vim.diagnostic.enable(nil, false, { ns_id = diagnostic_ns })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, diagnostic_ns)
+        vim.diagnostic.enable(nil, true, { ns_id = diagnostic_ns })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, other_ns, false)
+        vim.diagnostic.enable(nil, false, { ns_id = other_ns })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
@@ -634,8 +634,11 @@ describe('vim.diagnostic', function()
       eq(2, result[4])
     end)
 
-    it('works with both a buffer and a namespace argument', function()
-      local result = exec_lua [[
+    --- @return table
+    local function test_enable(legacy)
+      local result = exec_lua(
+        [[
+        local legacy = ...
         local other_bufnr = vim.api.nvim_create_buf(true, false)
 
         vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
@@ -663,34 +666,68 @@ describe('vim.diagnostic', function()
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
+        if legacy then
+          vim.diagnostic.disable(diagnostic_bufnr, diagnostic_ns)
+        else
+          vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
+        end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(diagnostic_bufnr, other_ns, false)
+        if legacy then
+          vim.diagnostic.disable(diagnostic_bufnr, other_ns)
+        else
+          vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = other_ns })
+        end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns)
+        if legacy then
+          vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns)
+        else
+          vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
+        end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        -- Should have no effect
-        vim.diagnostic.enable(other_bufnr, other_ns, false)
+        if legacy then
+          -- Should have no effect
+          vim.diagnostic.disable(other_bufnr, other_ns)
+        else
+          -- Should have no effect
+          vim.diagnostic.enable(other_bufnr, false, { ns_id = other_ns })
+        end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
         return result
-      ]]
+      ]],
+        legacy
+      )
+
+      return result
+    end
+
+    it('with both buffer and namespace arguments', function()
+      local result = test_enable(false)
+      eq(4, result[1])
+      eq(2, result[2])
+      eq(1, result[3])
+      eq(3, result[4])
+      eq(3, result[5])
+    end)
 
+    it('with both buffer and namespace arguments (deprecated signature)', function()
+      -- Exercise the legacy/deprecated signature.
+      local result = test_enable(true)
       eq(4, result[1])
       eq(2, result[2])
       eq(1, result[3])
@@ -1742,7 +1779,7 @@ describe('vim.diagnostic', function()
       eq(
         0,
         exec_lua [[
-        vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns, false)
+        vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
         vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
           make_error('Diagnostic From Server 1:1', 1, 1, 1, 1),
         })
@@ -1753,7 +1790,7 @@ describe('vim.diagnostic', function()
       eq(
         2,
         exec_lua [[
-        vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns)
+        vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
         return count_extmarks(diagnostic_bufnr, diagnostic_ns)
       ]]
       )
@@ -2719,7 +2756,7 @@ describe('vim.diagnostic', function()
           make_error('Diagnostic #1', 1, 1, 1, 1),
         })
         vim.api.nvim_set_current_buf(diagnostic_bufnr)
-        vim.diagnostic.enable(nil, nil, false)
+        vim.diagnostic.enable(nil, false)
         return {
           vim.diagnostic.is_enabled(),
           vim.diagnostic.is_enabled(diagnostic_bufnr),
-- 
cgit 


From f1dfe32bf5552197e0068298b0527526a4f918b1 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 18 Apr 2024 07:57:58 -0700
Subject: feat(lua): enable(enable:boolean, filter:table) #28374

Problem:
We need to establish a pattern for `enable()`.

Solution:
- First `enable()` parameter is always `enable:boolean`.
- Update `vim.diagnostic.enable()`
- Update `vim.lsp.inlay_hint.enable()`.
    - It was not released yet, so no deprecation is needed. But to help
      HEAD users, it will show an informative error.
- vim.deprecate():
    - Improve message when the "removal version" is a *current or older* version.
---
 test/functional/lua/diagnostic_spec.lua | 83 ++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 28 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 1a87d159c7..31358a2226 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -329,7 +329,7 @@ describe('vim.diagnostic', function()
     eq(
       { 1, 1, 2, 0, 2 },
       exec_lua [[
-      vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
+      vim.diagnostic.enable(false, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
       return {
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.ERROR, diagnostic_ns),
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.WARN, other_ns),
@@ -344,7 +344,7 @@ describe('vim.diagnostic', function()
     eq(
       all_highlights,
       exec_lua([[
-      vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
+      vim.diagnostic.enable(true, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
       return {
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.ERROR, diagnostic_ns),
         count_diagnostics(diagnostic_bufnr, vim.diagnostic.severity.WARN, other_ns),
@@ -371,7 +371,7 @@ describe('vim.diagnostic', function()
       vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, ns_1_diags)
       vim.diagnostic.set(other_ns, diagnostic_bufnr, ns_2_diags)
 
-      vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
+      vim.diagnostic.enable(false, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
 
       return {
         count_extmarks(diagnostic_bufnr, diagnostic_ns),
@@ -383,8 +383,8 @@ describe('vim.diagnostic', function()
     eq(
       { 4, 0 },
       exec_lua [[
-      vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
-      vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = other_ns })
+      vim.diagnostic.enable(true, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
+      vim.diagnostic.enable(false, { bufnr = diagnostic_bufnr, ns_id = other_ns })
 
       return {
         count_extmarks(diagnostic_bufnr, diagnostic_ns),
@@ -478,6 +478,31 @@ describe('vim.diagnostic', function()
   end)
 
   describe('enable() and disable()', function()
+    it('validation', function()
+      matches('expected boolean, got table', pcall_err(exec_lua, [[vim.diagnostic.enable({})]]))
+      matches(
+        'filter: expected table, got string',
+        pcall_err(exec_lua, [[vim.diagnostic.enable(false, '')]])
+      )
+      matches(
+        'Invalid buffer id: 42',
+        pcall_err(exec_lua, [[vim.diagnostic.enable(true, { bufnr = 42 })]])
+      )
+      matches(
+        'expected boolean, got number',
+        pcall_err(exec_lua, [[vim.diagnostic.enable(42, {})]])
+      )
+      matches('expected boolean, got table', pcall_err(exec_lua, [[vim.diagnostic.enable({}, 42)]]))
+
+      -- Deprecated signature.
+      matches('Invalid buffer id: 42', pcall_err(exec_lua, [[vim.diagnostic.enable(42)]]))
+      -- Deprecated signature.
+      matches(
+        'namespace does not exist or is anonymous',
+        pcall_err(exec_lua, [[vim.diagnostic.enable(nil, 42)]])
+      )
+    end)
+
     it('without arguments', function()
       local result = exec_lua [[
         vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
@@ -500,7 +525,7 @@ describe('vim.diagnostic', function()
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, false)
+        vim.diagnostic.enable(false)
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
@@ -561,19 +586,19 @@ describe('vim.diagnostic', function()
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(diagnostic_bufnr, false)
+        vim.diagnostic.enable(false, { bufnr = diagnostic_bufnr })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(diagnostic_bufnr)
+        vim.diagnostic.enable(true, { bufnr = diagnostic_bufnr })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
                              count_extmarks(other_bufnr, diagnostic_ns))
 
-        vim.diagnostic.enable(other_bufnr, false)
+        vim.diagnostic.enable(false, { bufnr = other_bufnr })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns) +
@@ -610,17 +635,17 @@ describe('vim.diagnostic', function()
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, false, { ns_id = diagnostic_ns })
+        vim.diagnostic.enable(false, { ns_id = diagnostic_ns })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, true, { ns_id = diagnostic_ns })
+        vim.diagnostic.enable(true, { ns_id = diagnostic_ns })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
 
-        vim.diagnostic.enable(nil, false, { ns_id = other_ns })
+        vim.diagnostic.enable(false, { ns_id = other_ns })
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
                              count_extmarks(diagnostic_bufnr, other_ns))
@@ -669,7 +694,7 @@ describe('vim.diagnostic', function()
         if legacy then
           vim.diagnostic.disable(diagnostic_bufnr, diagnostic_ns)
         else
-          vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
+          vim.diagnostic.enable(false, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
         end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
@@ -679,7 +704,7 @@ describe('vim.diagnostic', function()
         if legacy then
           vim.diagnostic.disable(diagnostic_bufnr, other_ns)
         else
-          vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = other_ns })
+          vim.diagnostic.enable(false, { bufnr = diagnostic_bufnr, ns_id = other_ns })
         end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
@@ -689,7 +714,7 @@ describe('vim.diagnostic', function()
         if legacy then
           vim.diagnostic.enable(diagnostic_bufnr, diagnostic_ns)
         else
-          vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
+          vim.diagnostic.enable(true, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
         end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
@@ -701,7 +726,7 @@ describe('vim.diagnostic', function()
           vim.diagnostic.disable(other_bufnr, other_ns)
         else
           -- Should have no effect
-          vim.diagnostic.enable(other_bufnr, false, { ns_id = other_ns })
+          vim.diagnostic.enable(false, { bufnr = other_bufnr, ns_id = other_ns })
         end
 
         table.insert(result, count_extmarks(diagnostic_bufnr, diagnostic_ns) +
@@ -1592,7 +1617,7 @@ describe('vim.diagnostic', function()
   end)
 
   describe('set()', function()
-    it('validates its arguments', function()
+    it('validation', function()
       matches(
         'expected a list of diagnostics',
         pcall_err(exec_lua, [[vim.diagnostic.set(1, 0, {lnum = 1, col = 2})]])
@@ -1779,7 +1804,7 @@ describe('vim.diagnostic', function()
       eq(
         0,
         exec_lua [[
-        vim.diagnostic.enable(diagnostic_bufnr, false, { ns_id = diagnostic_ns })
+        vim.diagnostic.enable(false, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
         vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
           make_error('Diagnostic From Server 1:1', 1, 1, 1, 1),
         })
@@ -1790,7 +1815,7 @@ describe('vim.diagnostic', function()
       eq(
         2,
         exec_lua [[
-        vim.diagnostic.enable(diagnostic_bufnr, true, { ns_id = diagnostic_ns })
+        vim.diagnostic.enable(true, { bufnr = diagnostic_bufnr, ns_id = diagnostic_ns })
         return count_extmarks(diagnostic_bufnr, diagnostic_ns)
       ]]
       )
@@ -2750,31 +2775,33 @@ describe('vim.diagnostic', function()
 
     it('is_enabled', function()
       eq(
-        { false, false, false, false },
+        { false, false, false, false, false },
         exec_lua [[
         vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
           make_error('Diagnostic #1', 1, 1, 1, 1),
         })
         vim.api.nvim_set_current_buf(diagnostic_bufnr)
-        vim.diagnostic.enable(nil, false)
+        vim.diagnostic.enable(false)
         return {
           vim.diagnostic.is_enabled(),
-          vim.diagnostic.is_enabled(diagnostic_bufnr),
-          vim.diagnostic.is_enabled(diagnostic_bufnr, diagnostic_ns),
-          vim.diagnostic.is_enabled(_, diagnostic_ns),
+          vim.diagnostic.is_enabled{ bufnr = 0 },
+          vim.diagnostic.is_enabled{ bufnr = diagnostic_bufnr },
+          vim.diagnostic.is_enabled{ bufnr = diagnostic_bufnr, ns_id = diagnostic_ns },
+          vim.diagnostic.is_enabled{ bufnr = 0, ns_id = diagnostic_ns },
         }
       ]]
       )
 
       eq(
-        { true, true, true, true },
+        { true, true, true, true, true },
         exec_lua [[
         vim.diagnostic.enable()
         return {
           vim.diagnostic.is_enabled(),
-          vim.diagnostic.is_enabled(diagnostic_bufnr),
-          vim.diagnostic.is_enabled(diagnostic_bufnr, diagnostic_ns),
-          vim.diagnostic.is_enabled(_, diagnostic_ns),
+          vim.diagnostic.is_enabled{ bufnr = 0 },
+          vim.diagnostic.is_enabled{ bufnr = diagnostic_bufnr },
+          vim.diagnostic.is_enabled{ bufnr = diagnostic_bufnr, ns_id = diagnostic_ns },
+          vim.diagnostic.is_enabled{ bufnr = 0, ns_id = diagnostic_ns },
         }
       ]]
       )
-- 
cgit 


From ad76b050eb2cd03174c108b5ae6759b3c1ea8941 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Tue, 23 Apr 2024 19:06:41 +0800
Subject: fix(diagnostic): open_float on multi-line diagnostics #28301

Problem: when diagnostic have a range of line, open_float not work.

Solution: filter diagnostic by line number range.
---
 test/functional/lua/diagnostic_spec.lua | 41 +++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 31358a2226..4f60a2255f 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -2506,6 +2506,47 @@ describe('vim.diagnostic', function()
       ]]
       )
     end)
+
+    it('works for multi-line diagnostics #21949', function()
+      -- open float failed non diagnostic lnum
+      eq(
+        vim.NIL,
+        exec_lua [[
+        local diagnostics = {
+          make_error("Error in two lines lnum is 1 and end_lnum is 2", 1, 1, 2, 3),
+        }
+        local winids = {}
+        vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
+        vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, diagnostics)
+        local _, winnr = vim.diagnostic.open_float(0, { header = false })
+        return winnr
+      ]]
+      )
+
+      -- can open a float window on lnum 1
+      eq(
+        { '1. Error in two lines lnum is 1 and end_lnum is 2' },
+        exec_lua [[
+        vim.api.nvim_win_set_cursor(0, {2, 0})
+        local float_bufnr, winnr = vim.diagnostic.open_float(0, { header = false })
+        local lines = vim.api.nvim_buf_get_lines(float_bufnr, 0, -1, false)
+        vim.api.nvim_win_close(winnr, true)
+        return lines
+      ]]
+      )
+
+      -- can open a float window on end_lnum 2
+      eq(
+        { '1. Error in two lines lnum is 1 and end_lnum is 2' },
+        exec_lua [[
+        vim.api.nvim_win_set_cursor(0, {3, 0})
+        local float_bufnr, winnr = vim.diagnostic.open_float(0, { header = false })
+        local lines = vim.api.nvim_buf_get_lines(float_bufnr, 0, -1, false)
+        vim.api.nvim_win_close(winnr, true)
+        return lines
+      ]]
+      )
+    end)
   end)
 
   describe('setloclist()', function()
-- 
cgit 


From a4fc3bb0e68c8b078377fd9826e4cca3b4b3fdbf Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Tue, 23 Apr 2024 19:13:58 +0800
Subject: fix(diagnostic): vim.diagnostic.get(…,{lnum=…}) on multi-line
 diagnostic #28273
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
vim.diagnostic.get(…,{lnum=…}) does not match multi-line diagnostics.

Solution: add end_lnum support.
---
 test/functional/lua/diagnostic_spec.lua | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 4f60a2255f..be3d55089b 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -1076,13 +1076,13 @@ describe('vim.diagnostic', function()
 
     it('allows filtering by line', function()
       eq(
-        1,
+        2,
         exec_lua [[
         vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
           make_error("Error 1", 1, 1, 1, 5),
           make_warning("Warning on Server 1", 1, 1, 2, 3),
           make_info("Ignored information", 1, 1, 2, 3),
-          make_error("Error On Other Line", 2, 1, 1, 5),
+          make_error("Error On Other Line", 3, 1, 3, 5),
         })
 
         return #vim.diagnostic.get(diagnostic_bufnr, {lnum = 2})
@@ -1192,13 +1192,16 @@ describe('vim.diagnostic', function()
 
     it('allows filtering by line', function()
       eq(
-        exec_lua [[return { [vim.diagnostic.severity.ERROR] = 1 }]],
+        exec_lua [[return {
+          [vim.diagnostic.severity.WARN] = 1,
+          [vim.diagnostic.severity.INFO] = 1,
+        }]],
         exec_lua [[
           vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
             make_error("Error 1", 1, 1, 1, 5),
             make_warning("Warning on Server 1", 1, 1, 2, 3),
             make_info("Ignored information", 1, 1, 2, 3),
-            make_error("Error On Other Line", 2, 1, 1, 5),
+            make_error("Error On Other Line", 3, 1, 3, 5),
           })
 
           return vim.diagnostic.count(diagnostic_bufnr, {lnum = 2})
-- 
cgit 


From 052498ed42780a76daea589d063cd8947a894673 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 20 Apr 2024 17:44:13 +0200
Subject: test: improve test conventions

Specifically, functions that are run in the context of the test runner
are put in module `test/testutil.lua` while the functions that are run
in the context of the test session are put in
`test/functional/testnvim.lua`.

Closes https://github.com/neovim/neovim/issues/27004.
---
 test/functional/lua/diagnostic_spec.lua | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index be3d55089b..f36a676ba9 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -1,14 +1,15 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local NIL = vim.NIL
-local command = t.command
-local clear = t.clear
-local exec_lua = t.exec_lua
+local command = n.command
+local clear = n.clear
+local exec_lua = n.exec_lua
 local eq = t.eq
 local matches = t.matches
-local api = t.api
+local api = n.api
 local pcall_err = t.pcall_err
-local fn = t.fn
+local fn = n.fn
 
 describe('vim.diagnostic', function()
   before_each(function()
@@ -1891,12 +1892,12 @@ describe('vim.diagnostic', function()
 
     it('respects legacy signs placed with :sign define or sign_define #26618', function()
       -- Legacy signs for diagnostics were deprecated in 0.10 and will be removed in 0.12
-      eq(0, t.fn.has('nvim-0.12'))
+      eq(0, n.fn.has('nvim-0.12'))
 
-      t.command('sign define DiagnosticSignError text= texthl= linehl=ErrorMsg numhl=ErrorMsg')
-      t.command('sign define DiagnosticSignWarn text= texthl= linehl=WarningMsg numhl=WarningMsg')
-      t.command('sign define DiagnosticSignInfo text= texthl= linehl=Underlined numhl=Underlined')
-      t.command('sign define DiagnosticSignHint text= texthl= linehl=Underlined numhl=Underlined')
+      n.command('sign define DiagnosticSignError text= texthl= linehl=ErrorMsg numhl=ErrorMsg')
+      n.command('sign define DiagnosticSignWarn text= texthl= linehl=WarningMsg numhl=WarningMsg')
+      n.command('sign define DiagnosticSignInfo text= texthl= linehl=Underlined numhl=Underlined')
+      n.command('sign define DiagnosticSignHint text= texthl= linehl=Underlined numhl=Underlined')
 
       local result = exec_lua [[
         vim.diagnostic.config({
-- 
cgit 


From b13e63db1dbc1dbc7e23690653df1b7317660a2b Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 25 Apr 2024 08:07:44 -0500
Subject: feat(diagnostic): goto functions jump to highest severity (#28490)

When the "severity" option is nil, vim.diagnostic.goto_next() and
vim.diagnostic.goto_prev() jump to the next diagnostic with the highest
severity.
---
 test/functional/lua/diagnostic_spec.lua | 141 +++++++++++++++++++++++++++-----
 1 file changed, 119 insertions(+), 22 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index f36a676ba9..534d78fd09 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -18,12 +18,12 @@ describe('vim.diagnostic', function()
     exec_lua [[
       require('vim.diagnostic')
 
-      function make_diagnostic(msg, x1, y1, x2, y2, severity, source, code)
+      function make_diagnostic(msg, lnum, col, end_lnum, end_col, severity, source, code)
         return {
-          lnum = x1,
-          col = y1,
-          end_lnum = x2,
-          end_col = y2,
+          lnum = lnum,
+          col = col,
+          end_lnum = end_lnum,
+          end_col = end_col,
           message = msg,
           severity = severity,
           source = source,
@@ -31,20 +31,20 @@ describe('vim.diagnostic', function()
         }
       end
 
-      function make_error(msg, x1, y1, x2, y2, source, code)
-        return make_diagnostic(msg, x1, y1, x2, y2, vim.diagnostic.severity.ERROR, source, code)
+      function make_error(msg, lnum, col, end_lnum, end_col, source, code)
+        return make_diagnostic(msg, lnum, col, end_lnum, end_col, vim.diagnostic.severity.ERROR, source, code)
       end
 
-      function make_warning(msg, x1, y1, x2, y2, source, code)
-        return make_diagnostic(msg, x1, y1, x2, y2, vim.diagnostic.severity.WARN, source, code)
+      function make_warning(msg, lnum, col, end_lnum, end_col, source, code)
+        return make_diagnostic(msg, lnum, col, end_lnum, end_col, vim.diagnostic.severity.WARN, source, code)
       end
 
-      function make_info(msg, x1, y1, x2, y2, source, code)
-        return make_diagnostic(msg, x1, y1, x2, y2, vim.diagnostic.severity.INFO, source, code)
+      function make_info(msg, lnum, col, end_lnum, end_col, source, code)
+        return make_diagnostic(msg, lnum, col, end_lnum, end_col, vim.diagnostic.severity.INFO, source, code)
       end
 
-      function make_hint(msg, x1, y1, x2, y2, source, code)
-        return make_diagnostic(msg, x1, y1, x2, y2, vim.diagnostic.severity.HINT, source, code)
+      function make_hint(msg, lnum, col, end_lnum, end_col, source, code)
+        return make_diagnostic(msg, lnum, col, end_lnum, end_col, vim.diagnostic.severity.HINT, source, code)
       end
 
       function count_diagnostics(bufnr, severity, namespace)
@@ -934,15 +934,112 @@ describe('vim.diagnostic', function()
       eq(
         { 4, 0 },
         exec_lua [[
-    vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
-        make_error('Diagnostic #1', 3, 9001, 3, 9001),
-        make_error('Diagnostic #2', 4, -1, 4, -1),
-    })
-    vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
-    vim.api.nvim_win_set_cursor(0, {1, 1})
-    vim.diagnostic.goto_next { float = false }
-    return vim.diagnostic.get_next_pos { namespace = diagnostic_ns }
-    ]]
+          vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
+            make_error('Diagnostic #1', 3, 9001, 3, 9001),
+            make_error('Diagnostic #2', 4, -1, 4, -1),
+          })
+          vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
+          vim.api.nvim_win_set_cursor(0, {1, 1})
+          vim.diagnostic.goto_next { float = false }
+          return vim.diagnostic.get_next_pos { namespace = diagnostic_ns }
+        ]]
+      )
+    end)
+
+    it('jumps to diagnostic with highest severity', function()
+      exec_lua([[
+        vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
+          make_info('Info', 1, 0, 1, 1),
+          make_error('Error', 2, 0, 2, 1),
+          make_warning('Warning', 3, 0, 3, 1),
+          make_error('Error', 4, 0, 4, 1),
+        })
+
+        vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
+        vim.api.nvim_win_set_cursor(0, {1, 0})
+      ]])
+
+      eq(
+        { 3, 0 },
+        exec_lua([[
+        vim.diagnostic.goto_next()
+        return vim.api.nvim_win_get_cursor(0)
+      ]])
+      )
+
+      eq(
+        { 5, 0 },
+        exec_lua([[
+        vim.diagnostic.goto_next()
+        return vim.api.nvim_win_get_cursor(0)
+      ]])
+      )
+
+      exec_lua([[
+        vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
+          make_info('Info', 1, 0, 1, 1),
+          make_hint('Hint', 2, 0, 2, 1),
+          make_warning('Warning', 3, 0, 3, 1),
+          make_hint('Hint', 4, 0, 4, 1),
+          make_warning('Warning', 5, 0, 5, 1),
+        })
+
+        vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
+        vim.api.nvim_win_set_cursor(0, {1, 0})
+      ]])
+
+      eq(
+        { 4, 0 },
+        exec_lua([[
+        vim.diagnostic.goto_next()
+        return vim.api.nvim_win_get_cursor(0)
+      ]])
+      )
+
+      eq(
+        { 6, 0 },
+        exec_lua([[
+        vim.diagnostic.goto_next()
+        return vim.api.nvim_win_get_cursor(0)
+      ]])
+      )
+    end)
+
+    it('jumps to next diagnostic if severity is non-nil', function()
+      exec_lua([[
+        vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
+          make_info('Info', 1, 0, 1, 1),
+          make_error('Error', 2, 0, 2, 1),
+          make_warning('Warning', 3, 0, 3, 1),
+          make_error('Error', 4, 0, 4, 1),
+        })
+
+        vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
+        vim.api.nvim_win_set_cursor(0, {1, 0})
+      ]])
+
+      eq(
+        { 2, 0 },
+        exec_lua([[
+        vim.diagnostic.goto_next({ severity = { min = vim.diagnostic.severity.HINT } })
+        return vim.api.nvim_win_get_cursor(0)
+      ]])
+      )
+
+      eq(
+        { 3, 0 },
+        exec_lua([[
+        vim.diagnostic.goto_next({ severity = { min = vim.diagnostic.severity.HINT } })
+        return vim.api.nvim_win_get_cursor(0)
+      ]])
+      )
+
+      eq(
+        { 4, 0 },
+        exec_lua([[
+        vim.diagnostic.goto_next({ severity = { min = vim.diagnostic.severity.HINT } })
+        return vim.api.nvim_win_get_cursor(0)
+      ]])
       )
     end)
   end)
-- 
cgit 


From 96f59e1b9902f7622eaaea02eea0329a88b98202 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Sun, 28 Apr 2024 05:05:41 +0800
Subject: fix(diagnostic): invalid col number  compare in next_diagnostic
 (#28397)

Problem: when line is blank link then there will got an invalid column number in math.min compare.

Solution: make sure the min column number is 0 not an illegal number.
---
 test/functional/lua/diagnostic_spec.lua | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 534d78fd09..2e6f7fbf36 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -1101,6 +1101,29 @@ describe('vim.diagnostic', function()
       ]]
       )
     end)
+
+    it('works on blank line #28397', function()
+      eq(
+        { 0, 2 },
+        exec_lua [[
+        local test_bufnr = vim.api.nvim_create_buf(true, false)
+        vim.api.nvim_buf_set_lines(test_bufnr, 0, -1, false, {
+          'first line',
+          '',
+          '',
+          'end line',
+        })
+        vim.diagnostic.set(diagnostic_ns, test_bufnr, {
+          make_info('Diagnostic #1', 0, 2, 0, 2),
+          make_info('Diagnostic #2', 2, 0, 2, 0),
+          make_info('Diagnostic #3', 2, 0, 2, 0),
+        })
+        vim.api.nvim_win_set_buf(0, test_bufnr)
+        vim.api.nvim_win_set_cursor(0, {3, 0})
+        return vim.diagnostic.get_prev_pos { namespace = diagnostic_ns}
+      ]]
+      )
+    end)
   end)
 
   describe('get()', function()
-- 
cgit 


From ee41153a945876ad0c7f0927ffa7b5a5afdaca89 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 30 Apr 2024 09:57:31 +0100
Subject: feat(diagnostic): revert default behaviour of goto_next/prev()

Follow-up to #28490

Problem:

The new behaviour of goto_next/prev() of navigating to the next highest
severity doesn't work well when diagnostic providers have different
interpretations of severities. E.g. the user may be blocked from
navigating to a useful LSP warning, due to some linter error.

Solution:

The behaviour of next highest severity is now a hidden option
`_highest = true`. We can revisit how to integrate this behaviour
during the 0.11 cycle.
---
 test/functional/lua/diagnostic_spec.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/functional/lua/diagnostic_spec.lua')

diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 2e6f7fbf36..05082bc132 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -962,7 +962,7 @@ describe('vim.diagnostic', function()
       eq(
         { 3, 0 },
         exec_lua([[
-        vim.diagnostic.goto_next()
+        vim.diagnostic.goto_next({_highest = true})
         return vim.api.nvim_win_get_cursor(0)
       ]])
       )
@@ -970,7 +970,7 @@ describe('vim.diagnostic', function()
       eq(
         { 5, 0 },
         exec_lua([[
-        vim.diagnostic.goto_next()
+        vim.diagnostic.goto_next({_highest = true})
         return vim.api.nvim_win_get_cursor(0)
       ]])
       )
@@ -991,7 +991,7 @@ describe('vim.diagnostic', function()
       eq(
         { 4, 0 },
         exec_lua([[
-        vim.diagnostic.goto_next()
+        vim.diagnostic.goto_next({_highest = true})
         return vim.api.nvim_win_get_cursor(0)
       ]])
       )
@@ -999,7 +999,7 @@ describe('vim.diagnostic', function()
       eq(
         { 6, 0 },
         exec_lua([[
-        vim.diagnostic.goto_next()
+        vim.diagnostic.goto_next({_highest = true})
         return vim.api.nvim_win_get_cursor(0)
       ]])
       )
@@ -1021,7 +1021,7 @@ describe('vim.diagnostic', function()
       eq(
         { 2, 0 },
         exec_lua([[
-        vim.diagnostic.goto_next({ severity = { min = vim.diagnostic.severity.HINT } })
+        vim.diagnostic.goto_next()
         return vim.api.nvim_win_get_cursor(0)
       ]])
       )
@@ -1029,7 +1029,7 @@ describe('vim.diagnostic', function()
       eq(
         { 3, 0 },
         exec_lua([[
-        vim.diagnostic.goto_next({ severity = { min = vim.diagnostic.severity.HINT } })
+        vim.diagnostic.goto_next()
         return vim.api.nvim_win_get_cursor(0)
       ]])
       )
@@ -1037,7 +1037,7 @@ describe('vim.diagnostic', function()
       eq(
         { 4, 0 },
         exec_lua([[
-        vim.diagnostic.goto_next({ severity = { min = vim.diagnostic.severity.HINT } })
+        vim.diagnostic.goto_next()
         return vim.api.nvim_win_get_cursor(0)
       ]])
       )
-- 
cgit