Compare commits

..

No commits in common. "b2023a404badff0fed469bf7313d8cd363d94218" and "fa12cedb729ff8003ae243b317e89de275ada702" have entirely different histories.

3 changed files with 8 additions and 17 deletions

5
nvimrc
View File

@ -30,9 +30,6 @@ command! -nargs=0 -bar Helptags
\| endfor \| endfor
\| helptags ALL \| helptags ALL
" https://stackoverflow.com/questions/34675677/disable-highlight-matched-parentheses-in-vim-let-loaded-matchparen-1-not-w
let g:loaded_matchparen=1
set shiftwidth=2 set shiftwidth=2
set shiftround set shiftround
set tabstop=2 set tabstop=2
@ -47,7 +44,7 @@ set smartindent
set copyindent set copyindent
set autoindent set autoindent
set hlsearch set hlsearch
set noshowmatch set showmatch
set wildmenu set wildmenu
set wildmode=list:full,full set wildmode=list:full,full
set number set number

View File

@ -92,6 +92,11 @@ require("lualine").setup({
lualine_x = { lualine_x = {
{ {
function() function()
local go_status_line = vim.api.nvim_call_function("go#statusline#Show", {})
if go_status_line ~= "" then
return go_status_line
end
return vim.bo.filetype return vim.bo.filetype
end, end,
padding = { left = 1, right = 0 }, padding = { left = 1, right = 0 },

View File

@ -54,7 +54,7 @@ nvim_lsp.gopls.setup({
settings = { settings = {
gopls = { gopls = {
staticcheck = true, staticcheck = true,
-- Disabling linksInHover may not be working as expected: -- Disalbing linksInHover may not be working as expected:
linksInHover = false, linksInHover = false,
usePlaceholders = true, usePlaceholders = true,
experimentalPostfixCompletions = true, experimentalPostfixCompletions = true,
@ -65,23 +65,12 @@ nvim_lsp.gopls.setup({
unusedresult = true, unusedresult = true,
nilness = true, nilness = true,
}, },
buildFlags = { "-tags=acceptance" }
}, },
}, },
init_options = { init_options = {
usePlaceholders = true, usePlaceholders = true,
}, },
capabilities = vim.tbl_extend( capabilities = capabilities,
"error",
capabilities,
{
workspace = {
didChangeWatchedFiles = {
dynamicRegistration = true
}
}
}
),
on_attach = on_attach, on_attach = on_attach,
}) })