Update vimrc

Author: sheerun

vimrc

@@ -1,8 +1,4 @@
-let mapleader = "\<Space>"
-let maplocalleader = ","
 let g:CoolTotalMatches = 1
-let ayucolor="dark"
-"set termguicolors
 let g:lightline = { 'colorscheme': 'ayu_dark' }
 
 let remote = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
@@ -15,24 +11,32 @@ endif
 
 if !filereadable(local)
   :silent execute '!curl --create-dirs -sfLo '.local.' '.remote
-end"
+end
+
+
+let g:vimspector_enable_mappings = 'HUMAN'
+let g:vimspector_sidebar_width = 40
+let g:vimspector_bottombar_height = 5
 
 call plug#begin()
 
 Plug 'sheerun/vimrc'
 Plug 'sheerun/vim-polyglot'
 
+Plug 'eliba2/vim-node-inspect'
+Plug '~/.vim/plugged/vim-inspect'
+
 " iTerm2 and tmux integration
 Plug 'sjl/vitality.vim'
+"Plug 'camspiers/lens.vim'
 
-Plug '~/.fzf'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
 
 Plug 'ayu-theme/ayu-vim'
 
-" Nice bottom panel
+"Nice bottom panel
 Plug 'itchyny/lightline.vim'
-"
-" Plug 'sheerun/night-and-day'
 
 " File manager that open on '-'
 Plug 'justinmk/vim-dirvish'
@@ -42,9 +46,6 @@ Plug 'terryma/vim-expand-region'
 vmap v <Plug>(expand_region_expand)
 vmap <C-v> <Plug>(expand_region_shrink)
 
-nnoremap <Leader>/ :Rg<Space>
-Plug 'jremmen/vim-ripgrep'
-
 " Toggle comments with gcc
 let g:tcomment_mapleader1 = '<C-c>'
 Plug 'tomtom/tcomment_vim'
@@ -53,20 +54,17 @@ Plug 'tomtom/tcomment_vim'
 Plug 'tpope/vim-rsi'
 
 " Automatically adds 'end' block to code
-Plug 'tpope/vim-endwise'
+Plug 'cohama/lexima.vim'
 
 " Integration with git
 Plug 'tpope/vim-fugitive'
 
 " Supports repeating plugin commands with . 
 Plug 'tpope/vim-repeat'
 
-" Various shortcuts like ]q for next quick list item
+" Various shortcuts like ]z for next quick list item
 " Plug 'tpope/vim-unimpaired'
 
-" Allow to :Rename files
-Plug 'danro/rename.vim'
-
 " Automatically find root project directory
 Plug 'airblade/vim-rooter'
 let g:rooter_disable_map = 1
@@ -80,6 +78,8 @@ nmap sk :SplitjoinJoin<cr>
 " Use ii / ai for indenting
 Plug 'michaeljsmith/vim-indent-object'
 
+Plug 'tpope/vim-scriptease'
+
 " For more reliable indenting and performance
 set foldmethod=indent
 set fillchars="fold: "
@@ -88,7 +88,8 @@ set fillchars="fold: "
 " Plug 'vim-scripts/IndexedSearch'
 Plug 'vim-scripts/SmartCase'
 
-Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
+let g:coc_quickfix_open_command = 'cfirst'
 
 function! s:check_back_space() abort
   let col = col('.') - 1
@@ -105,9 +106,69 @@ Plug 'romainl/vim-cool'
 
 Plug 'sbdchd/neoformat'
 
+Plug 'kristijanhusak/vim-js-file-import'
+
+Plug 'rakr/vim-one'
+
+
+Plug 'puremourning/vimspector'
+
 call plug#end()
 
-vmap <Leader>y "+y
+colorscheme ayu
+
+let $FZF_DEFAULT_COMMAND = 'git ls-files'
+let g:fzf_buffers_jump = 1
+let g:fzf_layout = { 'down': '25%' }
+let g:fzf_preview_window = []
+
+function! Ripgrep(query)
+  let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case -- %s || true'
+  let initial_command = printf(command_fmt, shellescape(a:query))
+  let reload_command = printf(command_fmt, '{q}')
+  let spec = {'options': ['--phony', '--query', a:query, '--multi', '--bind', 'enter:select-all+accept,change:reload:'.reload_command]}
+  call fzf#vim#grep(initial_command, 1, spec, 0)
+endfunction
+
+function! s:GetSelection()
+  return getline('.')[col("'<")-1:col("'>")-1]
+endfunction
+
+nnoremap <Leader>o :FZF<CR>
+vnoremap <Leader>/ :call Ripgrep(<SID>GetSelection())<CR>
+nnoremap <Leader>/ :call Ripgrep("")<CR>
+nnoremap <silent>Q :cclose<CR>
+
+func! s:CustomiseUI()
+  " Remove winbar for code window
+  call win_gotoid( g:vimspector_session_windows.code )
+  nunmenu WinBar
+  nnoremenu WinBar.x :call vimspector#Reset( { 'interactive': v:false } )<CR>
+  nnoremenu WinBar.F4\ ⟲ :call vimspector#Restart()<CR>
+  nnoremenu WinBar.F5\ ▶ :call vimspector#Continue()<CR>
+  nnoremenu WinBar.F9\ ● :call vimspector#ToggleBreakpoint()<CR>
+  nnoremenu WinBar.F10\ ↓  :call vimspector#StepOver()<CR>
+  nnoremenu WinBar.F11\ → :call vimspector#StepInto()<CR>
+  nnoremenu WinBar.F12\ ← :call vimspector#StepOut()<CR>
+
+  " Create winbar for variables window
+  call win_gotoid( g:vimspector_session_windows.variables )
+  nunmenu WinBar
+
+endfunction
+augroup MyVimspectorUICustomistaion
+  autocmd!
+  autocmd User VimspectorUICreated call <SID>CustomiseUI()
+augroup END
+
+sign define vimspectorBP text=\ ●           texthl=WarningMsg
+sign define vimspectorBPCond text=\ •       texthl=WarningMsg
+sign define vimspectorBPDisabled text=\ ○   texthl=LineNr
+sign define vimspectorPC text=\ »           texthl=String
+sign define vimspectorPCBP text=\ »         texthl=String
+sign define vimspectorCurrentThread text=>  texthl=String
+sign define vimspectorCurrentFrame text=>   texthl=String
+
 vmap <Leader>d "+d
 nmap <Leader>p "+p
 nmap <Leader>P "+P
@@ -116,33 +177,66 @@ vmap <Leader>P "+P
 nmap <Leader><Leader> V
 nmap <Leader>b :make<CR>
 nnoremap <Leader><Tab> <C-^>
-nnoremap <Leader>y :!annotate expand('%:p') " what?
-
-nnoremap <Leader>o :FZF<CR>
+nnoremap <silent> <Leader><CR> :CocAction<CR>
 
-vnoremap <silent> y y`]
-vnoremap <silent> p p`]
-nnoremap <silent> p p`e
 
+" vnoremap <silent> i i`]
+" vnoremap <silent> p p`]
+" nnoremap <silent> p p`e
+"
 nnoremap <Leader>w :w<CR>
-nnoremap <Leader>s :wq<CR>
-nnoremap <Leader>v V
+nnoremap <Leader>z :wq<CR>
+nnoremap <Leader>q :qa<CR>
+
+nnoremap <C-a> 0
+nnoremap <C-e> $
+
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+"
 
-nnoremap H 0
-nnoremap L $
+function! s:GoToDefinition()
+  if CocAction('jumpDefinition')
+    return v:true
+  endif
+
+  let ret = execute("silent! normal \<C-]>")
+  if ret =~ "Error"
+    call searchdecl(expand('<cword>'))
+  endif
+endfunction
+nnoremap <silent><nowait><CR> :<C-u>call <SID>GoToDefinition()<CR>
+
+nmap <silent> <F2> <Plug>(coc-rename)
+nmap <silent> <Leader>f <Plug>(coc-fix-current)
+nmap <silent><nowait>§  <Plug>(coc-codeaction-selected)<CR>
+vmap <silent><nowait>§  <Plug>(coc-codeaction-selected)<CR>
+xmap if <Plug>(coc-funcobj-i)
+omap if <Plug>(coc-funcobj-i)
+xmap af <Plug>(coc-funcobj-a)
+omap af <Plug>(coc-funcobj-a)
+xmap ic <Plug>(coc-classobj-i)
+omap ic <Plug>(coc-classobj-i)
+xmap ac <Plug>(coc-classobj-a)
+omap ac <Plug>(coc-classobj-a)
+nmap <silent> <Leader>= :call CocAction('format')<CR>:silent call CocAction('runCommand', 'editor.action.organizeImport')<CR>
 
 map <silent> <C-j> :cnext<CR>
 map <silent> <C-k> :cprev<CR>
 
-colorscheme ayu
+autocmd BufReadPost quickfix nnoremap <buffer> <CR> <CR>
+autocmd QuickfixCmdPost grep cfirst
 
-"au BufWritePre *.go :call CocAction('runCommand', 'editor.action.organizeImport')
+au BufNewFile,BufRead *.x set ft=vlang
+au BufWritePre *.go call CocAction('format')
 
-nmap <silent> gd <Plug>(coc-definition)
-nmap <silent> gy <Plug>(coc-type-definition)
-nmap <silent> gi <Plug>(coc-implementation)
-nmap <silent> gr <Plug>(coc-references)
-nmap <silent> <CR> <Plug>(coc-definition)
-nmap <silent> <Leader>r <Plug>(coc-references)
-nmap <silent> f <Plug>(coc-fix-current)
-autocmd BufReadPost quickfix nnoremap <buffer> <CR> <CR>
+" Show git commit that changed given line
+map <silent><Leader>g :call setbufvar(winbufnr(popup_atcursor(systemlist("cd " . shellescape(fnamemodify(resolve(expand('%:p')), ":h")) . " && git log --no-merges -n 1 -L " . shellescape(line("v") . "," . line(".") . ":" . resolve(expand("%:p")))), { "padding": [1,1,1,1], "pos": "botleft", "wrap": 0 })), "&filetype", "git")<CR>
+
+" Show map output in editable window
+cnorea <expr> map getcmdtype() == ':' && getcmdline() ==# 'map'
+    \ ? "new <bar> put=execute('map') <bar> set buftype=nofile bufhidden=delete"
+    \ : 'map'
+
+set shortmess+=F