Replarce youcompleteme with deoplete

1 files changed, 47 insertions, 40 deletions

diff --git a/Editor/vimrc b/Editor/vimrc
index bc17c0e..ed83fe1 100644
--- a/Editor/vimrc
+++ b/Editor/vimrc
@@ -13,18 +13,18 @@ Plugin 'takac/vim-hardtime'
 Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-repeat'
-" fancy ass ide stuff
-Plugin 'Shougo/deoplete.nvim'
-Plugin 'zchee/deoplete-clang'
-"Plugin 'Valloric/YouCompleteMe'
-Plugin 'SirVer/ultisnips'
-Plugin 'honza/vim-snippets'
-" make it look good
-Plugin 'junegunn/goyo.vim'
-" neomutt support
+"" fancy ass ide stuff
+"Plugin 'Shougo/deoplete.nvim'
+"Plugin 'zchee/deoplete-clang'
+""Plugin 'Valloric/YouCompleteMe'
+"Plugin 'SirVer/ultisnips'
+"Plugin 'honza/vim-snippets'
+"" make it look good
+"Plugin 'junegunn/goyo.vim'
+"" neomutt support
 Plugin 'neomutt/neomutt.vim'
-" dissaprove indented code to far
-"Plugin 'dodie/vim-disapprove-deep-indentation'
+"" dissaprove indented code to far
+""Plugin 'dodie/vim-disapprove-deep-indentation'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -86,10 +86,10 @@ nnoremap <leader>v :!open '<cfile>'<CR>
 "read spaces in path's
 set isfname+=32
 
-""Set tab to two spaces
-"set expandtab
-"set shiftwidth=2
-"set softtabstop=2
+"Set tab to two spaces
+set expandtab
+set shiftwidth=2
+set softtabstop=2
 
 
 "Make tab into another escape
@@ -120,28 +120,35 @@ let g:hardtime_default_on = 1
 let g:hardtime_showmsg = 0 
 let g:hardtime_allow_different_key = 1
 
-"Deoplete enable
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#sources#clang#libclang_path = '/usr/lib/libclang.so'
-let g:deoplete#sources#clang#clang_header = '/usr/lib/clang/'
-
-" supertab
-let g:SuperTabDefaultCompletionType    = '<C-n>'
-let g:SuperTabCrMapping                = 0
-
-" ultisnips
-let g:UltiSnipsSnippetsDir='~/.vim/snippets'
-let g:UltiSnipsEditSplit='vertical'
-let g:UltiSnipsExpandTrigger           = '<tab>'
-let g:UltiSnipsJumpForwardTrigger      = '<tab>'
-let g:UltiSnipsJumpBackwardTrigger     = '<s-tab>'
-
-"""""""""""""""""""""""
-" CUSTOM TEXT-OBJECTS "
-"""""""""""""""""""""""
-for char in [ '_', '.', ':', ',', ';', '<bar>', '/', '<bslash>', '*', '+', '%', '-', '#' ]
-    execute 'xnoremap i' . char . ' :<C-u>normal! T' . char . 'vt' . char . '<CR>'
-    execute 'onoremap i' . char . ' :normal vi' . char . '<CR>'
-    execute 'xnoremap a' . char . ' :<C-u>normal! F' . char . 'vf' . char . '<CR>'
-    execute 'onoremap a' . char . ' :normal va' . char . '<CR>'
-endfor
+""Deoplete enable
+"let g:deoplete#enable_at_startup = 1
+"let g:deoplete#sources#clang#libclang_path = '/usr/lib/libclang.so'
+"let g:deoplete#sources#clang#clang_header = '/usr/lib/clang/'
+"
+"" supertab
+"let g:SuperTabDefaultCompletionType    = '<C-n>'
+"let g:SuperTabCrMapping                = 0
+"
+"" ultisnips
+"let g:UltiSnipsSnippetsDir='~/.vim/snippets'
+"let g:UltiSnipsEditSplit='vertical'
+"let g:UltiSnipsExpandTrigger           = '<tab>'
+"let g:UltiSnipsJumpForwardTrigger      = '<tab>'
+"let g:UltiSnipsJumpBackwardTrigger     = '<s-tab>'
+"
+""""""""""""""""""""""""
+"" CUSTOM TEXT-OBJECTS "
+""""""""""""""""""""""""
+"for char in [ '_', '.', ':', ',', ';', '<bar>', '/', '<bslash>', '*', '+', '%', '-', '#' ]
+"    execute 'xnoremap i' . char . ' :<C-u>normal! T' . char . 'vt' . char . '<CR>'
+"    execute 'onoremap i' . char . ' :normal vi' . char . '<CR>'
+"    execute 'xnoremap a' . char . ' :<C-u>normal! F' . char . 'vf' . char . '<CR>'
+"    execute 'onoremap a' . char . ' :normal va' . char . '<CR>'
+"endfor
+
+highlight ExtraWhitespace guibg=purple
+match ExtraWhitespace /\s\+$\| \+\ze\t/
+autocmd BufWinEnter * match ExtraWhitespace /\s\+$\| \+\ze\t/
+autocmd InsertEnter * match ExtraWhitespace /\s\+$%#\@<!$\| \+\ze\t/
+autocmd InsertLeave * match ExtraWhitespace /\s\+$\| \+\ze\t/
+autocmd BufWinLeave * call clearmatches()