fix: unify timeout error message format with LSP

stevearc · Sep 17, 2023 · 0d963f8 · 0d963f8
1 parent a589750
commit 0d963f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doc/recipes.md b/doc/recipes.md
@@ -149,7 +149,7 @@ require("conform").setup({
       return
     end
     local function on_format(err)
-      if err and err:match("timed out$") then
+      if err and err:match("timeout$") then
         slow_format_filetypes[vim.bo[bufnr].filetype] = true
       end
     end

diff --git a/lua/conform/runner.lua b/lua/conform/runner.lua
@@ -515,7 +515,7 @@ M.format_sync = function(bufnr, formatters, timeout_ms, range)
     if remaining <= 0 then
       return {
         code = M.ERROR_CODE.TIMEOUT,
-        message = string.format("Formatter '%s' timed out", formatter.name),
+        message = string.format("Formatter '%s' timeout", formatter.name),
       }
     end
     local done = false
@@ -539,7 +539,7 @@ M.format_sync = function(bufnr, formatters, timeout_ms, range)
       if wait_reason == -1 then
         return {
           code = M.ERROR_CODE.TIMEOUT,
-          message = string.format("Formatter '%s' timed out", formatter.name),
+          message = string.format("Formatter '%s' timeout", formatter.name),
         }
       else
         return {