diff --git a/lua/taken/plugins/conform.lua b/lua/taken/plugins/conform.lua index edbe261..10871f8 100644 --- a/lua/taken/plugins/conform.lua +++ b/lua/taken/plugins/conform.lua @@ -12,19 +12,21 @@ return { function dprintOrPrettier() if checkPrettierConfig() then - return { "prettier" } + return "prettier" else - return { "dprint" } + return "dprint" end end require("conform").setup({ formatters_by_ft = { lua = { "stylua" }, - javascript = dprintOrPrettier(), - typescript = dprintOrPrettier(), - json = dprintOrPrettier(), - markdown = dprintOrPrettier(), + javascript = { dprintOrPrettier() }, + typescript = { dprintOrPrettier() }, + javascriptreact = { "rustywind", dprintOrPrettier() }, + typescriptreact = { "rustywind", dprintOrPrettier() }, + json = { dprintOrPrettier() }, + markdown = { dprintOrPrettier() }, }, format_on_save = { timeout_ms = 500, diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua index 3d984f8..8431a88 100644 --- a/lua/taken/plugins/lsp/mason.lua +++ b/lua/taken/plugins/lsp/mason.lua @@ -45,6 +45,7 @@ return { "stylua", "prettier", "dprint", + "rustywind", }, automatic_installation = true, })