Merge branch 'master' of https://github.com/johan-adriaans/Dotfiles

Author: johan-adriaans

.vim/coc-settings.json

@@ -0,0 +1,3 @@
+{
+  "intelephense.licenceKey": ""
+}

.vimrc

@@ -2,7 +2,7 @@ call plug#begin('~/.vim/plug-bundles')
 
 " ====================== COC =========================
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
-let g:coc_global_extensions = ['coc-html', 'coc-phpls', 'coc-css', 'coc-sql', 'coc-json', 'coc-yaml', 'coc-marketplace', 'coc-tsserver', 'coc-tabnine']
+let g:coc_global_extensions = ['coc-html', 'coc-phpls', 'coc-css', 'coc-tsserver']
 
 function! s:show_documentation()
   if (index(['vim','help'], &filetype) >= 0)
@@ -18,6 +18,12 @@ set signcolumn=yes
 " Use K to show documentation in preview window
 nnoremap <silent> K :call <SID>show_documentation()<CR>
 
+" To make <CR> auto-select the first completion item and notify coc.nvim to format on enter
+inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
+		\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
+
+nmap <c-]> <Plug>(coc-declaration)
+
 " Highlight symbol under cursor on CursorHold
 autocmd CursorHold * silent call CocActionAsync('highlight')
 
@@ -120,7 +126,7 @@ Plug 'morhetz/gruvbox'
 call plug#end()
 
 set nocompatible                    " choose no compatibility with legacy vi
-set hidden                          " if hidden is not set, TextEdit might fail.
+" set hidden                          " if hidden is not set, TextEdit might fail.
 set cmdheight=2                     " Better display for messages
 set updatetime=300                  " You will have bad experience for diagnostic
                                     " messages when it's default 4000.
@@ -169,8 +175,10 @@ set nocursorline
 
 syntax sync minlines=256
 set synmaxcol=3000
+
 autocmd FileType html syntax sync fromstart
 autocmd FileType xml syntax sync fromstart
+autocmd FileType tpl syntax sync fromstart
 
 "" Pretty wrap indent
 if exists("&breakindent")