diff options
| author | Steven Arcangeli <stevearc@stevearc.com> | 2023-09-16 22:37:18 -0700 |
|---|---|---|
| committer | Steven Arcangeli <stevearc@stevearc.com> | 2023-09-16 22:37:18 -0700 |
| commit | 0d963f82add9ca4faf49b54fc28f57038742ded3 (patch) | |
| tree | 8368c5bb75c6131238823a97410295d8866b80aa | |
| parent | a589750635fcc5bb52c7e572cd853446c2c63855 (diff) | |
fix: unify timeout error message format with LSP
| -rw-r--r-- | doc/recipes.md | 2 | ||||
| -rw-r--r-- | lua/conform/runner.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/recipes.md b/doc/recipes.md index c235475..5aeaf47 100644 --- 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 index fff638b..e162b38 100644 --- 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 { |