diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 4dfc32b..7bc9af5 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -7,34 +7,6 @@ return { config = function() local conform = require("conform") - -- Helper: Find project-local executable, fallback to global - -- Searches node_modules/.bin/, vendor/bin/, and Mason bin first - local function find_executable(names) - local cwd = vim.fn.getcwd() - local mason_bin = vim.fn.stdpath("data") .. "/mason/bin/" - - local search_paths = { - cwd .. "/node_modules/.bin/", - cwd .. "/vendor/bin/", - mason_bin, - } - - for _, name in ipairs(names) do - for _, path in ipairs(search_paths) do - local full_path = path .. name - if vim.fn.executable(full_path) == 1 then - return full_path - end - end - - if vim.fn.executable(name) == 1 then - return name - end - end - - return nil - end - conform.setup({ formatters_by_ft = { -- JavaScript, TypeScript, CSS, SCSS, JSON, HTML, Markdown @@ -56,18 +28,12 @@ return { lua = { "stylua" }, }, - -- Custom formatter definitions with executable resolution + -- Formatter customization formatters = { - prettier = { - command = find_executable({ "prettier" }) or "prettier", - }, + -- Add WordPress coding standard to phpcbf phpcbf = { - -- Extend built-in phpcbf to add WordPress standard prepend_args = { "--standard=WordPress" }, }, - stylua = { - command = find_executable({ "stylua" }) or "stylua", - }, }, -- Format on save