diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index 6d83c3a..885955f 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -10,15 +10,15 @@ local utils = require "core.utils" -- export on_attach & capabilities for custom lspconfigs M.on_attach = function(client, bufnr) - if vim.g.vim_version > 7 then - -- nightly - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false - else - -- stable - client.resolved_capabilities.document_formatting = false - client.resolved_capabilities.document_range_formatting = false - end + -- if vim.g.vim_version > 7 then + -- -- nightly + -- client.server_capabilities.documentFormattingProvider = false + -- client.server_capabilities.documentRangeFormattingProvider = false + -- else + -- -- stable + -- client.resolved_capabilities.document_formatting = false + -- client.resolved_capabilities.document_range_formatting = false + -- end utils.load_mappings("lspconfig", { buffer = bufnr }) diff --git a/lua/plugins/configs/rust-tools.lua b/lua/plugins/configs/rust-tools.lua index c640fdf..c7c29c7 100644 --- a/lua/plugins/configs/rust-tools.lua +++ b/lua/plugins/configs/rust-tools.lua @@ -21,9 +21,17 @@ local options = { end, }, server = { - on_attach = function(client, bufnr) - end, + on_attach = + require("plugins.configs.lspconfig").on_attach }, + + settings = { + ["rust-analyzer"] = { + checkOnSave = { + command = "check", + } + } + } } rust.setup(options) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 3a6b5d0..bce220a 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -67,7 +67,6 @@ local plugins = { config = function () require("plugins.configs.rust-tools") require("core.utils").load_mappings "rust" - require("core.utils").load_mappings "lspconfig" end, },