From 1d2ec9ea62e688717f3d703cc1492951949b6b3c Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Mon, 27 Feb 2023 13:34:22 +0200 Subject: [PATCH] Added `cmake` --- lua/user/mason/mason-installer.lua | 219 +++++------------------------ 1 file changed, 32 insertions(+), 187 deletions(-) diff --git a/lua/user/mason/mason-installer.lua b/lua/user/mason/mason-installer.lua index b6cf32c..86b070c 100644 --- a/lua/user/mason/mason-installer.lua +++ b/lua/user/mason/mason-installer.lua @@ -3,34 +3,21 @@ if not status_ok then return end -local status_mason_lspconfig_ok, mason_lspconfig = pcall(require, "mason-lspconfig") -if not status_mason_lspconfig_ok then - return -end - local status_lspconfig_ok, lspconfig = pcall(require, "lspconfig") if not status_lspconfig_ok then return end -local status_update_all_ok, mason_update_all = pcall(require, "mason-update-all") -if not status_update_all_ok then +local status_mason_lspconfig_ok, mason_lspconfig = pcall(require, "mason-lspconfig") +if not status_mason_lspconfig_ok then return end -local status_tool_ok, mason_tool = pcall(require, "mason-tool-installer") -if not status_tool_ok then - return -end - -mason.setup() -mason_lspconfig.setup() -mason_update_all.setup() - local servers = { "bashls", "cssls", "clangd", + "cmake", "emmet_ls", "html", "jsonls", @@ -40,191 +27,49 @@ local servers = { "taplo", "texlab", "tsserver", - "vimls", "yamlls", } -mason_tool.setup({ - ensure_installed = { - "bash-language-server", - "clangd", - "css-lsp", - "diagnostic-languageserver", - "emmet-ls", - "html-lsp", - "json-lsp", - "lua-language-server", - "marksman", - "jedi-language-server", - "rust-analyzer", - "taplo", - "texlab", - "typescript-language-server", - "vim-language-server", - "yaml-language-server", - }, - auto_update = true, - run_on_start = true, - start_delay = 0, +mason.setup() + +mason_lspconfig.setup({ + ensure_installed = servers, }) -local opts = {} - +local on_attach = require("user.mason.handlers").on_attach +local capabilities = require("user.mason.handlers").capabilities for _, server in pairs(servers) do - opts = { - on_attach = require("user.mason.handlers").on_attach, - capabilities = require("user.mason.handlers").capabilities, + local opts = { + capabilities = capabilities, + on_attach = on_attach, } - -- if server == "lua_ls" then - -- local lua_ls_opts = require("user.mason.settings.lua_ls") - -- opts = vim.tbl_deep_extend("force", lua_ls_opts, opts) - -- end + if server == "bashls" then + local bashls_opts = require("user.mason.settings.bashls") + opts = vim.tbl_deep_extend("force", bashls_opts, opts) + end + + if server == "lua_ls" then + local lua_ls_opts = require("user.mason.settings.lua_ls") + opts = vim.tbl_deep_extend("force", lua_ls_opts, opts) + end + + if server == "emmet_ls" then + local emmet_ls_opts = require("user.mason.settings.emmet_ls") + opts = vim.tbl_deep_extend("force", emmet_ls_opts, opts) + end if server == "rust_analyzer" then - local keymap = vim.keymap.set - local key_opts = { silent = true } - - keymap("n", "rh", "RustSetInlayHints", key_opts) - keymap("n", "rhd", "RustDisableInlayHints", key_opts) - keymap("n", "th", "RustToggleInlayHints", key_opts) - keymap("n", "rr", "RustRunnables", key_opts) - keymap("n", "rem", "RustExpandMacro", key_opts) - keymap("n", "roc", "RustOpenCargo", key_opts) - keymap("n", "rpm", "RustParentModule", key_opts) - keymap("n", "rjl", "RustJoinLines", key_opts) - keymap("n", "rha", "RustHoverActions", key_opts) - keymap("n", "rhr", "RustHoverRange", key_opts) - keymap("n", "rmd", "RustMoveItemDown", key_opts) - keymap("n", "rmu", "RustMoveItemUp", key_opts) - keymap("n", "rsb", "RustStartStandaloneServerForBuffer", key_opts) - keymap("n", "rd", "RustDebuggables", key_opts) - keymap("n", "rv", "RustViewCrateGraph", key_opts) - keymap("n", "rw", "RustReloadWorkspace", key_opts) - keymap("n", "rss", "RustSSR", key_opts) - keymap("n", "rxd", "RustOpenExternalDocs", key_opts) - - require("rust-tools").setup({ - tools = { - on_initialized = function() - vim.cmd([[ - autocmd BufEnter,CursorHold,InsertLeave,BufWritePost *.rs silent! lua vim.lsp.codelens.refresh() - ]]) - end, - }, - server = { - on_attach = require("user.mason.handlers").on_attach, - capabilities = require("user.mason.handlers").capabilities, - settings = { - ["rust-analyzer"] = { - lens = { - enable = true, - }, - checkOnSave = { - command = "clippy", - }, - }, - }, - }, - }) - + local rust_analyzer_opts = require("user.mason.settings.rust_analyzer") + opts = vim.tbl_deep_extend("force", rust_analyzer_opts, opts) + require("rust-tools").setup(opts) goto continue end - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities.offsetEncoding = { "utf-16" } - if server == "clangd" then - require("clangd_extensions").setup({ - server = { - capabilities = capabilities, - -- options to pass to nvim-lspconfig - -- i.e. the arguments to require("lspconfig").clangd.setup({}) - }, - extensions = { - -- defaults: - -- Automatically set inlay hints (type hints) - autoSetHints = true, - -- These apply to the default ClangdSetInlayHints command - inlay_hints = { - -- Only show inlay hints for the current line - only_current_line = false, - -- Event which triggers a refersh of the inlay hints. - -- You can make this "CursorMoved" or "CursorMoved,CursorMovedI" but - -- not that this may cause higher CPU usage. - -- This option is only respected when only_current_line and - -- autoSetHints both are true. - only_current_line_autocmd = "CursorHold", - -- whether to show parameter hints with the inlay hints or not - show_parameter_hints = true, - -- prefix for parameter hints - parameter_hints_prefix = "<- ", - -- prefix for all the other hints (type, chaining) - other_hints_prefix = "=> ", - -- whether to align to the length of the longest line in the file - max_len_align = false, - -- padding from the left if max_len_align is true - max_len_align_padding = 1, - -- whether to align to the extreme right or not - right_align = false, - -- padding from the right if right_align is true - right_align_padding = 7, - -- The color of the hints - highlight = "Comment", - -- The highlight group priority for extmark - priority = 100, - }, - ast = { - -- -- These are unicode, should be available in any font - -- role_icons = { - -- type = "🄣", - -- declaration = "🄓", - -- expression = "🄔", - -- statement = ";", - -- specifier = "🄱", - -- ["template argument"] = "🆃", - -- }, - -- kind_icons = { - -- Compound = "đŸ„Č", - -- Recovery = "🅁", - -- TranslationUnit = "🅄", - -- PackExpansion = "🄿", - -- TemplateTypeParm = "🅃", - -- TemplateTemplateParm = "🅃", - -- TemplateParamObject = "🅃", - -- }, - -- These require codicons (https://github.com/microsoft/vscode-codicons) - role_icons = { - type = "î­Ł", - declaration = "îȘŒ", - expression = "", - specifier = "", - statement = "îȘ†", - ["template argument"] = "îȘ’", - }, - - kind_icons = { - Compound = "îȘ‹", - Recovery = "îȘ‡", - TranslationUnit = "î«©", - PackExpansion = "î©Œ", - TemplateTypeParm = "îȘ’", - TemplateTemplateParm = "îȘ’", - TemplateParamObject = "îȘ’", - }, - - highlights = { - detail = "Comment", - }, - }, - memory_usage = { - border = "none", - }, - symbol_info = { - border = "none", - }, - }, - }) + local clangd_opts = require("user.mason.settings.clangd") + opts = vim.tbl_deep_extend("force", clangd_opts, opts) + require("clangd_extensions").setup(opts) goto continue end