diff options
| author | Steven Arcangeli <506791+stevearc@users.noreply.github.com> | 2023-12-26 06:38:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-26 06:38:00 -0800 |
| commit | f245cca8ad42c9d344b53a18c3fc1a3c6724c2d4 (patch) | |
| tree | 71cf24c9888024ce02706e3d1e544187729dcf09 /lua/conform/init.lua | |
| parent | 7396fc0208539e2bd70e3e446f27529e28dba12b (diff) | |
fix(injected): handle inline injections (#251)
Diffstat (limited to 'lua/conform/init.lua')
| -rw-r--r-- | lua/conform/init.lua | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lua/conform/init.lua b/lua/conform/init.lua index 3824b4b..4fc35b5 100644 --- a/lua/conform/init.lua +++ b/lua/conform/init.lua @@ -36,6 +36,7 @@ local M = {} ---@field inherit? boolean ---@field command? string|fun(self: conform.FormatterConfig, ctx: conform.Context): string ---@field prepend_args? string|string[]|fun(self: conform.FormatterConfig, ctx: conform.Context): string|string[] +---@field format? fun(self: conform.LuaFormatterConfig, ctx: conform.Context, lines: string[], callback: fun(err: nil|string, new_lines: nil|string[])) Mutually exclusive with command ---@field options? table ---@class (exact) conform.FormatterMeta @@ -569,6 +570,12 @@ M.get_formatter_config = function(formatter, bufnr) if type(override) == "function" then override = override(bufnr) end + if override and override.command and override.format then + local msg = + string.format("Formatter '%s' cannot define both 'command' and 'format' function", formatter) + vim.notify_once(msg, vim.log.levels.ERROR) + return nil + end ---@type nil|conform.FormatterConfig local config = override @@ -581,7 +588,7 @@ M.get_formatter_config = function(formatter, bufnr) config = mod_config end elseif override then - if override.command then + if override.command or override.format then config = override else local msg = string.format( |