aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/tests.yml2
-rw-r--r--lua/conform/lsp_format.lua3
2 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 843ba73..fca39ce 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -43,7 +43,7 @@ jobs:
uses: JohnnyMorganz/stylua-action@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
- version: v0.15.2
+ version: v0.18.2
args: --check lua tests
run_tests:
diff --git a/lua/conform/lsp_format.lua b/lua/conform/lsp_format.lua
index f952ab9..089bde2 100644
--- a/lua/conform/lsp_format.lua
+++ b/lua/conform/lsp_format.lua
@@ -92,8 +92,7 @@ function M.format(options, callback)
elseif not vim.api.nvim_buf_is_valid(bufnr) then
return callback("buffer was deleted")
elseif changedtick ~= require("conform.util").buf_get_changedtick(bufnr) then
- return
- callback(
+ return callback(
string.format(
"Async LSP formatter discarding changes for %s: concurrent modification",
vim.api.nvim_buf_get_name(bufnr)