ringofstorms/nvim
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rust better

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2023-07-16 19:38:55 -05:00
parent 8ce76c7c91
commit f059534f62
4 changed files with 323 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

130
lua/plugins/null-ls.lua
View file

@ -1,60 +1,88 @@
function prereqs()
local output = vim.fn.system({
"which",
"cspell",
})
if output == nil or output == "" then
print("Installing cspell globally with npm")
vim.fn.system({
"npm",
"install",
"-g",
"cspell@latest",
})
end
local output = vim.fn.system({
"which",
"cspell",
})
if output == nil or output == "" then
print("Installing cspell globally with npm")
vim.fn.system({
"npm",
"install",
"-g",
"cspell@latest",
})
end
end
return {
{
"jose-elias-alvarez/null-ls.nvim",
dependencies = { "williamboman/mason.nvim" },
{
"jose-elias-alvarez/null-ls.nvim",
dependencies = { "williamboman/mason.nvim" },
build = prereqs,
opts = function(_, config)
-- config variable is the default definitions table for the setup function call
local null_ls = require("null-ls")
opts = function(_, config)
-- config variable is the default definitions table for the setup function call
local null_ls = require("null-ls")
-- Check supported formatters and linters
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
config.sources = {
-- Set a formatter
null_ls.builtins.formatting.prettier, -- typescript/javascript
null_ls.builtins.formatting.stylua,
null_ls.builtins.formatting.rustfmt,
null_ls.builtins.formatting.black, -- python
-- null_ls.builtins.code_actions.proselint, -- TODO looks interesting
null_ls.builtins.code_actions.cspell.with({
config = {
find_json = function()
return vim.fn.findfile("cspell.json", vim.fn.environ().HOME .. "/.config/nvim/lua/user/;")
end,
},
}),
null_ls.builtins.diagnostics.cspell.with({
extra_args = { "--config", "~/.config/nvim/lua/user/cspell.json" },
}),
}
-- Custom rust formatter: genemichaels first, then rustfmt, nightly if experimental
local rust_formatter_genemichaels = {
name = "rust_formatter_genemichaels",
method = null_ls.methods.FORMATTING,
filetypes = { "rust" },
generator = null_ls.formatter({
command = "genemichaels",
args = { '-q' },
to_stdin = true,
}),
}
-- ╰─ cat src/main.rs| rustfmt --emit=stdout --edition=2021 --color=never
local rust_formatter_rustfmt = {
name = "rust_formatter_rustfmt",
method = null_ls.methods.FORMATTING,
filetypes = { "rust" },
generator = null_ls.formatter({
command = "rustfmt",
args = { '--emit=stdout', "--edition=$(grep edition Cargo.toml | awk '{print substr($3,2,length($3)-2)}')",
'--color=never' },
to_stdin = true,
}),
}
config.update_in_insert = true
config.debug = true
null_ls.register(rust_formatter_genemichaels)
null_ls.register(rust_formatter_rustfmt)
return config
end,
},
{
"jay-babu/mason-null-ls.nvim",
opts = {
ensure_installed = { "rustfmt", "stylelua", "prettier", "black" },
},
},
-- Check supported formatters and linters
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
config.sources = {
null_ls.builtins.formatting.prettier, -- typescript/javascript
null_ls.builtins.formatting.stylua, -- lua
--null_ls.builtins.formatting.rustfmt, -- rust
rust_formatter_genemichaels, -- order matters, we run genemichaels first then rustfmt
rust_formatter_rustfmt,
null_ls.builtins.formatting.black, -- python
-- null_ls.builtins.code_actions.proselint, -- TODO looks interesting
null_ls.builtins.code_actions.cspell.with({
config = {
find_json = function()
return vim.fn.findfile("cspell.json", vim.fn.environ().HOME .. "/.config/nvim/lua/user/;")
end,
},
}),
null_ls.builtins.diagnostics.cspell.with({
extra_args = { "--config", "~/.config/nvim/lua/user/cspell.json" },
}),
}
config.update_in_insert = true
config.debug = true
return config
end,
},
{
"jay-babu/mason-null-ls.nvim",
opts = {
ensure_installed = { "rustfmt", "stylelua", "prettier", "black" },
},
},
}