From 14e15062ac676faf577d4f57e8f4c440749b80cc Mon Sep 17 00:00:00 2001
From: Danila Fedorin <daniel.fedorin@hpe.com>
Date: Tue, 14 Feb 2023 09:23:00 -0800
Subject: [PATCH] Add some Chapel-specific changes

---
 nvim/.config/nvim/init.vim | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index cd93cd0..02413ae 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -42,6 +42,7 @@ Plug 'folke/todo-comments.nvim'
 " Misc
 Plug 'nvim-lua/plenary.nvim'
 Plug 'airblade/vim-gitgutter'
+Plug 'f-person/git-blame.nvim'
 call plug#end()
 
 set exrc " Execute local vimscripts
@@ -53,10 +54,13 @@ set signcolumn=yes " Always show extra column
 set guifont=Iosevka:h35 " Use Ioeska in frontends.
 set hidden
 
+autocmd ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red
+autocmd BufWinEnter * match ExtraWhitespace /\s\+$/ " Highlight trailing whitespace
 autocmd BufRead,BufNewFile *.v set filetype=coq " Coq is not Verilog
 autocmd BufNewFile,BufRead *.cir set filetype=spice " LTSpice is Spice
 autocmd BufRead,BufNewFile *.dl set filetype=dl " Datalog is Datalog
 autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
+autocmd FileType cpp setlocal shiftwidth=2 " Chapel has two-wide indents
 
 " Settings for Rainbow
 let g:rainbow_active = 1
@@ -94,6 +98,10 @@ lua require('lspconfig').pylsp.setup{}
 nmap <silent>M <cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>
 nmap <silent>? <cmd>lua vim.lsp.buf.hover()<CR>
 nmap <silent>K <cmd>lua vim.lsp.buf.rename()<CR>
+nmap <silent><space>d <cmd>lua vim.lsp.buf.definition()<CR>
+nmap <silent><space>D <cmd>lua vim.lsp.buf.declaration()<CR>
+nmap <silent><space>i <cmd>lua vim.lsp.buf.implementation()<CR>
+nmap <silent><space>r <cmd>lua vim.lsp.buf.references()<CR>
 
 " Ctrl-e to open file in new tab (or jump to it)
 nmap <c-e> :Files<CR>
@@ -108,6 +116,9 @@ let g:compe.source = {
   \ 'nvim_lsp': v:true,
   \ }
 
+" Highlight 80th column
+let &colorcolumn="80,".join(range(120,999),",")
+
 " Racket settings
 au BufReadPost *.rkt,*.rktl set filetype=racket
 au filetype racket set lisp