From af6a2e732d2dfdf174fb2ca1518a72814fd106cf Mon Sep 17 00:00:00 2001
From: Steven Arcangeli <stevearc@stevearc.com>
Date: Thu, 16 May 2024 10:36:20 -0700
Subject: ci: test against Neovim 0.10

---
 .github/workflows/tests.yml | 3 ++-
 lua/conform/health.lua      | 1 +
 lua/conform/init.lua        | 1 +
 lua/conform/log.lua         | 1 +
 lua/conform/lsp_format.lua  | 1 +
 lua/conform/runner.lua      | 5 ++++-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5acd6cc..ff29fb7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -51,7 +51,8 @@ jobs:
       matrix:
         include:
           - nvim_tag: v0.8.3
-          - nvim_tag: v0.9.1
+          - nvim_tag: v0.9.4
+          - nvim_tag: v0.10.0
 
     name: Run tests
     runs-on: ubuntu-22.04
diff --git a/lua/conform/health.lua b/lua/conform/health.lua
index 13e90d5..3ee7567 100644
--- a/lua/conform/health.lua
+++ b/lua/conform/health.lua
@@ -1,5 +1,6 @@
 local M = {}
 
+---@diagnostic disable: deprecated
 -- The "report_" functions have been deprecated, so use the new ones if defined.
 local health_start = vim.health.start or vim.health.report_start
 local health_warn = vim.health.warn or vim.health.report_warn
diff --git a/lua/conform/init.lua b/lua/conform/init.lua
index d6ea639..b02f890 100644
--- a/lua/conform/init.lua
+++ b/lua/conform/init.lua
@@ -1,3 +1,4 @@
+---@diagnostic disable-next-line: deprecated
 local islist = vim.islist or vim.tbl_islist
 local M = {}
 
diff --git a/lua/conform/log.lua b/lua/conform/log.lua
index b99b14c..79ca15a 100644
--- a/lua/conform/log.lua
+++ b/lua/conform/log.lua
@@ -17,6 +17,7 @@ Log.get_logfile = function()
   if not ok then
     stdpath = vim.fn.stdpath("cache")
   end
+  assert(type(stdpath) == "string")
   return fs.join(stdpath, "conform.log")
 end
 
diff --git a/lua/conform/lsp_format.lua b/lua/conform/lsp_format.lua
index 6fa9a64..a4f9556 100644
--- a/lua/conform/lsp_format.lua
+++ b/lua/conform/lsp_format.lua
@@ -49,6 +49,7 @@ function M.get_format_clients(options)
       method = method,
     })
   else
+    ---@diagnostic disable-next-line: deprecated
     clients = vim.lsp.get_active_clients({
       id = options.id,
       bufnr = options.bufnr,
diff --git a/lua/conform/runner.lua b/lua/conform/runner.lua
index 1fbb33c..fd99807 100644
--- a/lua/conform/runner.lua
+++ b/lua/conform/runner.lua
@@ -169,6 +169,9 @@ end
 ---@param only_apply_range boolean
 ---@return boolean any_changes
 M.apply_format = function(bufnr, original_lines, new_lines, range, only_apply_range, dry_run)
+  if bufnr == 0 then
+    bufnr = vim.api.nvim_get_current_buf()
+  end
   if not vim.api.nvim_buf_is_valid(bufnr) then
     return false
   end
@@ -197,7 +200,7 @@ M.apply_format = function(bufnr, original_lines, new_lines, range, only_apply_ra
     result_type = "indices",
     algorithm = "histogram",
   })
-  assert(indices)
+  assert(type(indices) == "table")
   log.trace("Diff indices %s", indices)
   local text_edits = {}
   for _, idx in ipairs(indices) do
-- 
cgit v1.2.3-70-g09d2