summaryrefslogtreecommitdiff
path: root/.config/nvim/lua/getchoo/lsp/config
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua/getchoo/lsp/config')
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/cmp.lua88
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/init.lua10
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/lsp_config.lua38
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/mason.lua4
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/null_ls.lua28
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/sources.lua38
6 files changed, 103 insertions, 103 deletions
diff --git a/.config/nvim/lua/getchoo/lsp/config/cmp.lua b/.config/nvim/lua/getchoo/lsp/config/cmp.lua
index 868b6f1..0f0f51f 100644
--- a/.config/nvim/lua/getchoo/lsp/config/cmp.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/cmp.lua
@@ -5,63 +5,63 @@ local luasnip = require("luasnip")
local M = {}
local has_words_before = function()
- local line, col = unpack(vim.api.nvim_win_get_cursor(0))
- return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+ local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+ return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
end
local feedkey = function(key, mode)
- vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
+ vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
end
M.config = {
- snippet = {
- expand = function(args)
- vim.fn["vsnip#anonymous"](args.body)
- luasnip.lsp_expand(args.body)
- end,
- },
- mapping = mapping.preset.insert({
- ["<Tab>"] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_next_item()
- elseif luasnip.expand_or_jumpable() then
- luasnip.expand_or_jump()
- elseif vim.fn["vsnip#available"](1) == 1 then
- feedkey("<Plug>(vsnip-expand-or-jump)", "")
- elseif has_words_before() then
- cmp.complete()
- else
- fallback()
- end
- end, { "i", "s" }),
- ["<S-Tab>"] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_prev_item()
- elseif luasnip.jumpable(-1) then
- luasnip.jump(-1)
- elseif vim.fn["vsnip#available"](-1) == 1 then
- feedkey("<Plug>(vsnip-jump-prev)", "")
- else
- fallback()
- end
- end, { "i", "s" }),
- }),
- sources = cmp.config.sources({
- { name = "nvim_lsp" },
- { name = "luasnip" },
- { name = "vsnip" },
- { name = "buffer" },
- { name = "path" },
- }),
+ snippet = {
+ expand = function(args)
+ vim.fn["vsnip#anonymous"](args.body)
+ luasnip.lsp_expand(args.body)
+ end,
+ },
+ mapping = mapping.preset.insert({
+ ["<Tab>"] = cmp.mapping(function(fallback)
+ if cmp.visible() then
+ cmp.select_next_item()
+ elseif luasnip.expand_or_jumpable() then
+ luasnip.expand_or_jump()
+ elseif vim.fn["vsnip#available"](1) == 1 then
+ feedkey("<Plug>(vsnip-expand-or-jump)", "")
+ elseif has_words_before() then
+ cmp.complete()
+ else
+ fallback()
+ end
+ end, { "i", "s" }),
+ ["<S-Tab>"] = cmp.mapping(function(fallback)
+ if cmp.visible() then
+ cmp.select_prev_item()
+ elseif luasnip.jumpable(-1) then
+ luasnip.jump(-1)
+ elseif vim.fn["vsnip#available"](-1) == 1 then
+ feedkey("<Plug>(vsnip-jump-prev)", "")
+ else
+ fallback()
+ end
+ end, { "i", "s" }),
+ }),
+ sources = cmp.config.sources({
+ { name = "nvim_lsp" },
+ { name = "luasnip" },
+ { name = "vsnip" },
+ { name = "buffer" },
+ { name = "path" },
+ }),
}
-local capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities())
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
M.capabilities = capabilities
M.on_attach = function(_, bufnr)
- vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
+ vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
end
return M
diff --git a/.config/nvim/lua/getchoo/lsp/config/init.lua b/.config/nvim/lua/getchoo/lsp/config/init.lua
index be6c357..1c928d3 100644
--- a/.config/nvim/lua/getchoo/lsp/config/init.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/init.lua
@@ -16,11 +16,11 @@ M.mason_lspconfig = mason.mason_lspconfig
M.null_ls = null_ls.config
M.treesitter = {
- auto_install = true,
- highlight = {
- enable = true,
- additional_vim_regex_highlighting = false,
- },
+ auto_install = true,
+ highlight = {
+ enable = true,
+ additional_vim_regex_highlighting = false,
+ },
}
M.trouble = {}
diff --git a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
index 6b13d19..4df3fe0 100644
--- a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
@@ -4,35 +4,35 @@ local sources = require("getchoo.lsp.config.sources")
local M = {}
local on_attach = function(client, bufnr)
- cmp.on_attach(client, bufnr)
+ cmp.on_attach(client, bufnr)
end
local all_config = {
- capabilities = cmp.capabilities,
- on_attach = on_attach,
+ capabilities = cmp.capabilities,
+ on_attach = on_attach,
}
local servers = {}
for _, server in ipairs(sources.lsp_servers) do
- servers[server] = all_config
+ servers[server] = all_config
end
servers["sumneko_lua"] = {
- capabilities = cmp.capabilities,
- on_attach = on_attach,
- settings = {
- Lua = {
- runtime = {
- version = "LuaJIT",
- },
- diagnostics = {
- globals = { "vim" },
- },
- workspace = {
- library = vim.api.nvim_get_runtime_file("", true),
- },
- },
- },
+ capabilities = cmp.capabilities,
+ on_attach = on_attach,
+ settings = {
+ Lua = {
+ runtime = {
+ version = "LuaJIT",
+ },
+ diagnostics = {
+ globals = { "vim" },
+ },
+ workspace = {
+ library = vim.api.nvim_get_runtime_file("", true),
+ },
+ },
+ },
}
M.servers = servers
diff --git a/.config/nvim/lua/getchoo/lsp/config/mason.lua b/.config/nvim/lua/getchoo/lsp/config/mason.lua
index 7201814..6814697 100644
--- a/.config/nvim/lua/getchoo/lsp/config/mason.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/mason.lua
@@ -4,11 +4,11 @@ local sources = require("getchoo.lsp.config.sources")
local M = {}
M.mason_tool_installer = {
- ensure_installed = sources.mason,
+ ensure_installed = sources.mason,
}
M.mason_lspconfig = {
- automatic_installation = true,
+ automatic_installation = true,
}
return M
diff --git a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
index 5fded8d..42cd30e 100644
--- a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
@@ -16,23 +16,23 @@ end
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
local formatting_on_attach = function(client, bufnr)
- if client.supports_method("textDocument/formatting") then
- vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
- vim.api.nvim_create_autocmd("BufWritePre", {
- group = augroup,
- buffer = bufnr,
- callback = function()
- -- local params = require("vim.lsp.util").make_formatting_params({})
- -- client.request("textDocument/formatting", params, nil, bufnr)
- lsp_formatting(bufnr) -- neovim >= 8
- end,
- })
- end
+ if client.supports_method("textDocument/formatting") then
+ vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+ vim.api.nvim_create_autocmd("BufWritePre", {
+ group = augroup,
+ buffer = bufnr,
+ callback = function()
+ -- local params = require("vim.lsp.util").make_formatting_params({})
+ -- client.request("textDocument/formatting", params, nil, bufnr)
+ lsp_formatting(bufnr) -- neovim >= 8
+ end,
+ })
+ end
end
M.config = {
- on_attach = formatting_on_attach,
- sources = sources.null_ls,
+ on_attach = formatting_on_attach,
+ sources = sources.null_ls,
}
return M
diff --git a/.config/nvim/lua/getchoo/lsp/config/sources.lua b/.config/nvim/lua/getchoo/lsp/config/sources.lua
index 7281508..1898870 100644
--- a/.config/nvim/lua/getchoo/lsp/config/sources.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/sources.lua
@@ -3,25 +3,25 @@ local diagnostics = null_ls.builtins.diagnostics
local formatting = null_ls.builtins.formatting
local M = {
- lsp_servers = { "rust_analyzer", "pyright", "bashls" },
- null_ls = {
- diagnostics.alex,
- diagnostics.codespell,
- diagnostics.flake8,
- formatting.black,
- formatting.codespell,
- formatting.prettier,
- formatting.rustfmt,
- formatting.stylua,
- },
- mason = {
- "alex",
- "black",
- "codespell",
- "flake8",
- "prettier",
- "stylua",
- },
+ lsp_servers = { "rust_analyzer", "pyright", "bashls" },
+ null_ls = {
+ diagnostics.alex,
+ diagnostics.codespell,
+ diagnostics.flake8,
+ formatting.black,
+ formatting.codespell,
+ formatting.prettier,
+ formatting.rustfmt,
+ formatting.stylua,
+ },
+ mason = {
+ "alex",
+ "black",
+ "codespell",
+ "flake8",
+ "prettier",
+ "stylua",
+ },
}
return M
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 07:48:56 +0000