personal/neovim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating all files to use stylua

Browse Source 
Signed-off-by: Taken <taken@mairimashita.org>
This commit is contained in:
Taken
2023-08-31 12:14:37 +02:00
parent 4e07e36ca7
commit 2eaafbc10e
27 changed files with 788 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lua/taken/plugins/lsp/lspconfig.lua
View File

@@ -1,33 +1,53 @@
local lspconfig_status, lspconfig = pcall(require, "lspconfig")
if not lspconfig_status then
return
return
end
local cmp_nvim_lsp_status, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
if not cmp_nvim_lsp_status then
return
return
end
local on_attach = function(client, bufnr)
local opts = { noremap = true, silent = true, buffer = bufnr }
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
vim.keymap.set("n", "gd", function()
vim.lsp.buf.definition()
end, opts)
vim.keymap.set("n", "K", function()
vim.lsp.buf.hover()
end, opts)
vim.keymap.set("n", "<leader>vws", function()
vim.lsp.buf.workspace_symbol()
end, opts)
vim.keymap.set("n", "<leader>vd", function()
vim.diagnostic.open_float()
end, opts)
vim.keymap.set("n", "[d", function()
vim.diagnostic.goto_next()
end, opts)
vim.keymap.set("n", "]d", function()
vim.diagnostic.goto_prev()
end, opts)
vim.keymap.set("n", "<leader>vca", function()
vim.lsp.buf.code_action()
end, opts)
vim.keymap.set("n", "<leader>vrr", function()
vim.lsp.buf.references()
end, opts)
vim.keymap.set("n", "<leader>vrn", function()
vim.lsp.buf.rename()
end, opts)
vim.keymap.set("i", "<C-h>", function()
vim.lsp.buf.signature_help()
end, opts)
end
local capabilities = cmp_nvim_lsp.default_capabilities()
local signs = { Error = "", Warn = "", Hint = "ﴞ ", Info = "" }
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
end
lspconfig["lua_ls"].setup({
@@ -43,21 +63,21 @@ lspconfig["lua_ls"].setup({
})
lspconfig["html"].setup({
capabilities = capabilities,
on_attach = on_attach,
capabilities = capabilities,
on_attach = on_attach,
})
lspconfig["tsserver"].setup({
capabilities = capabilities,
on_attach = on_attach,
capabilities = capabilities,
on_attach = on_attach,
})
lspconfig["cssls"].setup({
capabilities = capabilities,
on_attach = on_attach,
capabilities = capabilities,
on_attach = on_attach,
})
lspconfig["pyright"].setup({
capabilities = capabilities,
on_attach = on_attach,
capabilities = capabilities,
on_attach = on_attach,
})

34
lua/taken/plugins/lsp/mason.lua
View File

@@ -1,36 +1,36 @@
local mason_status, mason = pcall(require, "mason")
if not mason_status then
return
return
end
local mason_lspconfig_status, mason_lspconfig = pcall(require, "mason-lspconfig")
if not mason_lspconfig_status then
return
return
end
local mason_null_ls_status, mason_null_ls = pcall(require, "mason-null-ls")
if not mason_null_ls_status then
return
return
end
mason.setup()
mason_lspconfig.setup({
ensure_installed = {
"tsserver",
"html",
"cssls",
"lua_ls",
"pyright",
},
automatic_installation = true,
ensure_installed = {
"tsserver",
"html",
"cssls",
"lua_ls",
"pyright",
},
automatic_installation = true,
})
mason_null_ls.setup({
ensure_installed = {
"stylua",
"clang_format",
"eslint_d",
},
automatic_installation = true,
ensure_installed = {
"stylua",
"clang_format",
"eslint_d",
},
automatic_installation = true,
})

20
lua/taken/plugins/lsp/null-ls.lua
View File

@@ -1,19 +1,19 @@
local setup, null_ls = pcall(require, "null-ls")
if not setup then
return
return
end
local formatting = null_ls.builtins.formatting
local diagnostics = null_ls.builtins.diagnostics
null_ls.setup({
sources = {
formatting.stylua,
diagnostics.eslint_d.with({
condition = function(utils)
return utils.root_has_file(".eslintrc.js")
end,
}),
formatting.clang_format,
},
sources = {
formatting.stylua,
diagnostics.eslint_d.with({
condition = function(utils)
return utils.root_has_file(".eslintrc.js")
end,
}),
formatting.clang_format,
},
})