switch back to luafmt
This commit is contained in:
1 parent
e1868fd70e
commit
9b1e60358e
4 files changed
+15
-30
No files matched your search
@@ -46,8 +46,7 @@ vim.diagnostic.config(
|
||||
[vim.diagnostic.severity.HINT] = "DiagnosticLineNrHint"
|
||||
}
|
||||
},
|
||||
virtual_text =
|
||||
utils.iff(
|
||||
virtual_text = utils.iff(
|
||||
NV_DARCULA_ENABLE_VIRTUAL_TEXT,
|
||||
{prefix = symbols.line.info .. " "},
|
||||
false
|
||||
|
||||
@@ -19,27 +19,6 @@
|
||||
--
|
||||
local formatter_util = require("formatter.util")
|
||||
|
||||
local lua_format_executable = function()
|
||||
local executable = vim.fn.exepath("lua-format")
|
||||
if executable ~= "" then
|
||||
return executable
|
||||
end
|
||||
|
||||
local native_executable =
|
||||
vim.fs.joinpath(
|
||||
vim.fs.dirname(vim.fn.stdpath("data")),
|
||||
"nvim2",
|
||||
"mason",
|
||||
"bin",
|
||||
"lua-format"
|
||||
)
|
||||
if vim.fn.executable(native_executable) ~= 0 then
|
||||
return native_executable
|
||||
end
|
||||
|
||||
return "lua-format"
|
||||
end
|
||||
|
||||
require("formatter").setup {
|
||||
logging = true,
|
||||
log_level = vim.log.levels.WARN,
|
||||
@@ -66,15 +45,16 @@ require("formatter").setup {
|
||||
javascriptreact = {require("formatter.filetypes.javascriptreact").prettier},
|
||||
json = {require("formatter.filetypes.json").prettier},
|
||||
lua = {
|
||||
require("formatter.filetypes.lua").luafmt,
|
||||
function()
|
||||
return {
|
||||
exe = lua_format_executable(),
|
||||
exe = "luafmt",
|
||||
args = {
|
||||
"--column-limit=80",
|
||||
"--indent-width=2",
|
||||
formatter_util.escape_path(
|
||||
formatter_util.get_current_buffer_file_path()
|
||||
)
|
||||
"--stdin",
|
||||
"-l",
|
||||
"80",
|
||||
"-i",
|
||||
"2"
|
||||
},
|
||||
stdin = true
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user