Updated config

Added conform to replace null-ls
This commit is contained in:
2024-09-07 00:19:24 +02:00
parent c3ced61294
commit b25c9186b9
6 changed files with 62 additions and 25 deletions

View File

@@ -3,12 +3,14 @@ return {
"williamboman/mason.nvim",
dependencies = {
"williamboman/mason-lspconfig.nvim",
"jayp0521/mason-null-ls.nvim",
"WhoIsSethDaniel/mason-tool-installer.nvim",
-- "jayp0521/mason-null-ls.nvim",
},
config = function()
local mason = require("mason")
local mason_lspconfig = require("mason-lspconfig")
local mason_null_ls = require("mason-null-ls")
local mason_tool_installer = require("mason-tool-installer")
-- local mason_null_ls = require("mason-null-ls")
mason.setup({
ui = {
@@ -36,12 +38,22 @@ return {
automatic_installation = true,
})
mason_null_ls.setup({
mason_tool_installer.setup({
ensure_installed = {
"stylua",
"prettier",
"dprint",
},
automatic_installation = true,
})
-- mason_null_ls.setup({
-- ensure_installed = {
-- "stylua",
-- "prettier",
-- "dprint",
-- },
-- automatic_installation = true,
-- })
end,
}

View File

@@ -2,12 +2,12 @@
return {
"nvimtools/none-ls.nvim",
event = { "BufReadPre", "BufNewFile" },
enabled = false,
config = function()
local null_ls = require("null-ls")
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
local formatting = null_ls.builtins.formatting
local diagnostics = null_ls.builtins.diagnostics
local root_has_file = function(files)
return function(utils)

View File

@@ -15,7 +15,6 @@ return {
local on_attach = require("taken.utils.on_attach")
local capabilities = cmp_nvim_lsp.default_capabilities()
local augroup = vim.api.nvim_create_augroup("Typescript_tools", {})
local cwd = vim.fn.getcwd()
local tsserver_path = cwd .. "/node_modules/.bin/tsserver"
@@ -26,7 +25,6 @@ return {
else
cmd = "typescript-language-server"
end
local prettier_config = vim.fn.glob(cwd .. "/*prettierrc*", false, true)
typescript_tools.setup({
capabilities = capabilities,
@@ -35,19 +33,6 @@ return {
if cmd == "typescript-language-server" then
print("Using global tsserver")
end
if prettier_config == "" then
print("Using prettier to format")
return
else
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format({ async = false })
end,
})
end
end,
settings = {
cmd = { cmd, "--stdio" },