Use the LazyVim oxc extra instead of hand-rolled oxlint config
The oxlint LSP now enables type-aware linting on its own when tsgolint is present and .oxlintrc.json mentions typescript, and ships :LspOxlintFixAll -- which is what the oxlint_fix function reimplemented by shelling out to the CLI. The extra also sets fixKind = "all" and prefers the top-level oxlint config in monorepos. Fixes now apply as a workspace edit instead of writing to disk and reloading. oxfmt takes js/ts/json/vue over prettier; prettier keeps css/html/yaml/markdown. Add oxlint to mason so it resolves outside projects with a local install. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -29,6 +29,7 @@
|
|||||||
"lazyvim.plugins.extras.lang.tex",
|
"lazyvim.plugins.extras.lang.tex",
|
||||||
"lazyvim.plugins.extras.lang.toml",
|
"lazyvim.plugins.extras.lang.toml",
|
||||||
"lazyvim.plugins.extras.lang.typescript",
|
"lazyvim.plugins.extras.lang.typescript",
|
||||||
|
"lazyvim.plugins.extras.lang.typescript.oxc",
|
||||||
"lazyvim.plugins.extras.lang.typescript.tsgo",
|
"lazyvim.plugins.extras.lang.typescript.tsgo",
|
||||||
"lazyvim.plugins.extras.lang.typst",
|
"lazyvim.plugins.extras.lang.typst",
|
||||||
"lazyvim.plugins.extras.lang.yaml",
|
"lazyvim.plugins.extras.lang.yaml",
|
||||||
|
|||||||
@@ -35,62 +35,3 @@ if vim.fn.has("mac") == 1 then
|
|||||||
vim.keymap.set("t", "<D-v>", '<C-\\><C-n>"+pi')
|
vim.keymap.set("t", "<D-v>", '<C-\\><C-n>"+pi')
|
||||||
vim.keymap.set("t", "<D-s-v>", '<C-\\><C-n>"+pi')
|
vim.keymap.set("t", "<D-s-v>", '<C-\\><C-n>"+pi')
|
||||||
end
|
end
|
||||||
|
|
||||||
local function oxlint_cmd(bufnr)
|
|
||||||
local file = vim.api.nvim_buf_get_name(bufnr)
|
|
||||||
if file == "" then
|
|
||||||
return nil
|
|
||||||
end
|
|
||||||
|
|
||||||
local root = vim.fs.dirname(vim.fs.find({ "package.json", ".oxlintrc.json", "oxlint.config.ts" }, {
|
|
||||||
path = file,
|
|
||||||
upward = true,
|
|
||||||
})[1] or "")
|
|
||||||
|
|
||||||
local local_bin = root ~= "" and vim.fs.joinpath(root, "node_modules", ".bin", "oxlint") or nil
|
|
||||||
return local_bin and vim.fn.executable(local_bin) == 1 and local_bin or "oxlint"
|
|
||||||
end
|
|
||||||
|
|
||||||
local function oxlint_fix()
|
|
||||||
local bufnr = vim.api.nvim_get_current_buf()
|
|
||||||
local file = vim.api.nvim_buf_get_name(bufnr)
|
|
||||||
if file == "" then
|
|
||||||
vim.notify("Oxlint fix requires a file-backed buffer", vim.log.levels.WARN)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if vim.bo[bufnr].modified then
|
|
||||||
vim.cmd.update()
|
|
||||||
end
|
|
||||||
|
|
||||||
local cmd = oxlint_cmd(bufnr)
|
|
||||||
if not cmd or vim.fn.executable(cmd) ~= 1 then
|
|
||||||
vim.notify("oxlint executable not found", vim.log.levels.ERROR)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local cwd = vim.fs.dirname(vim.fs.find({ "package.json", ".oxlintrc.json", "oxlint.config.ts" }, {
|
|
||||||
path = file,
|
|
||||||
upward = true,
|
|
||||||
})[1] or file)
|
|
||||||
|
|
||||||
vim.system({ cmd, "--fix", "--type-aware", file }, { cwd = cwd, text = true }, function(result)
|
|
||||||
vim.schedule(function()
|
|
||||||
if result.code == 0 or result.code == 1 then
|
|
||||||
vim.cmd.checktime()
|
|
||||||
pcall(require("lint").try_lint, "oxlint")
|
|
||||||
local level = result.code == 0 and vim.log.levels.INFO or vim.log.levels.WARN
|
|
||||||
local msg = result.code == 0 and "Oxlint fix completed" or "Oxlint fix completed with remaining diagnostics"
|
|
||||||
vim.notify(msg, level)
|
|
||||||
else
|
|
||||||
local output = table.concat(vim.tbl_filter(function(v)
|
|
||||||
return v and v ~= ""
|
|
||||||
end, { result.stdout, result.stderr }), "\n")
|
|
||||||
vim.notify(output ~= "" and output or "Oxlint fix failed", vim.log.levels.ERROR)
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.api.nvim_create_user_command("OxlintFix", oxlint_fix, { desc = "Fix current file with oxlint" })
|
|
||||||
vim.keymap.set("n", "<leader>cx", oxlint_fix, { desc = "Oxlint Fix" })
|
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
local oxfmt_owned = {
|
||||||
|
"javascript",
|
||||||
|
"javascriptreact",
|
||||||
|
"typescript",
|
||||||
|
"typescriptreact",
|
||||||
|
"json",
|
||||||
|
"jsonc",
|
||||||
|
"vue",
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
"stevearc/conform.nvim",
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts.formatters_by_ft = opts.formatters_by_ft or {}
|
||||||
|
for _, ft in ipairs(oxfmt_owned) do
|
||||||
|
local formatters = opts.formatters_by_ft[ft]
|
||||||
|
if formatters then
|
||||||
|
opts.formatters_by_ft[ft] = vim.tbl_filter(function(formatter)
|
||||||
|
return formatter ~= "prettier"
|
||||||
|
end, formatters)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
}
|
||||||
@@ -1,16 +1,7 @@
|
|||||||
return {
|
return {
|
||||||
"mfussenegger/nvim-lint",
|
"mfussenegger/nvim-lint",
|
||||||
opts = {
|
opts = {
|
||||||
linters_by_ft = {
|
|
||||||
javascript = { "oxlint" },
|
|
||||||
typescript = { "oxlint" },
|
|
||||||
javascriptreact = { "oxlint" },
|
|
||||||
typescriptreact = { "oxlint" },
|
|
||||||
},
|
|
||||||
linters = {
|
linters = {
|
||||||
oxlint = {
|
|
||||||
prepend_args = { "--type-aware" },
|
|
||||||
},
|
|
||||||
["markdownlint-cli2"] = {
|
["markdownlint-cli2"] = {
|
||||||
prepend_args = {
|
prepend_args = {
|
||||||
"--config",
|
"--config",
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
return {
|
return {
|
||||||
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
opts = {
|
opts = {
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
@@ -10,8 +11,11 @@ return {
|
|||||||
-- removing .proto from the list of filetypes since clangd doesn't seem to be able to parse them
|
-- removing .proto from the list of filetypes since clangd doesn't seem to be able to parse them
|
||||||
filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
|
filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
|
||||||
},
|
},
|
||||||
-- Disable oxlint LSP - using nvim-lint with CLI instead for type-aware support
|
oxlint = {
|
||||||
oxlint = { enabled = false },
|
keys = {
|
||||||
|
{ "<leader>cx", "<cmd>LspOxlintFixAll<cr>", desc = "Oxlint Fix All" },
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
-- Disable eslint formatting as it's slow and timing out on big projects
|
-- Disable eslint formatting as it's slow and timing out on big projects
|
||||||
-- taken from
|
-- taken from
|
||||||
@@ -22,4 +26,9 @@ return {
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"mason-org/mason.nvim",
|
||||||
|
opts = { ensure_installed = { "oxlint" } },
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user