Compare commits

..

No commits in common. "5f5439d7935633b08d6b0b1090d20e98493145d3" and "b83f698dc478e5a9226b090fa9c0ad4cd429a429" have entirely different histories.

1 changed files with 3 additions and 4 deletions

View File

@ -961,8 +961,8 @@ local setup = {
local util = require 'lspconfig.util' local util = require 'lspconfig.util'
local mod_cache = nil local mod_cache = nil
require('lspconfig').gopls.setup { return {
{ default_config = {
-- NOTE: might just change to `nix run nixpkgs#gopls` for simplicity here -- NOTE: might just change to `nix run nixpkgs#gopls` for simplicity here
cmd = { 'gopls' }, cmd = { 'gopls' },
filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' }, filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' },
@ -993,7 +993,7 @@ Google's lsp server for golang.
default_config = { default_config = {
root_dir = [[root_pattern("go.work", "go.mod", ".git")]], root_dir = [[root_pattern("go.work", "go.mod", ".git")]],
}, },
} },
} }
end end
} }
@ -1107,7 +1107,6 @@ require('mason-lspconfig').setup_handlers({
}) })
setup["nil_ls"]() setup["nil_ls"]()
setup["gopls"]()
require("rust-tools").setup { require("rust-tools").setup {
tools = { tools = {
-- rust-tools options -- rust-tools options