From 6cbf6c2e9a93c5abacf1361d7680ae099bf394d8 Mon Sep 17 00:00:00 2001
From: Vasil Zlatanov <vasil.zlatanov@gmail.com>
Date: Fri, 19 Feb 2016 16:52:52 +0000
Subject: minor changes

---
 Editor/vimrc | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'Editor/vimrc')

diff --git a/Editor/vimrc b/Editor/vimrc
index 0fee3a2..2dee78d 100644
--- a/Editor/vimrc
+++ b/Editor/vimrc
@@ -99,10 +99,6 @@ set shiftwidth=2
 set softtabstop=2
 
 
-let g:ycm_confirm_extra_conf = 0
-let g:ycm_global_ycm_extra_conf = '/usr/share/vim/vimfiles/third_party/ycmd/ycmd/tests/testdata/.ycm_extra_conf.py'
-
-
 "Make tab into another escape
 "nnoremap <Tab> <Esc>
 "vnoremap <Tab> <Esc>gV
@@ -125,3 +121,39 @@ set mouse=
 nnoremap <Leader>o :CtrlP<CR>
 nnoremap <Leader>w :w<CR>
 
+
+"
+" YouCompleteMe options
+"
+
+let g:ycm_register_as_syntastic_checker = 1 "default 1
+let g:Show_diagnostics_ui = 1 "default 1
+
+"will put icons in Vim's gutter on lines that have a diagnostic set.
+"Turning this off will also turn off the YcmErrorLine and YcmWarningLine
+"highlighting
+let g:ycm_enable_diagnostic_signs = 1
+let g:ycm_enable_diagnostic_highlighting = 0
+let g:ycm_always_populate_location_list = 1 "default 0
+let g:ycm_open_loclist_on_ycm_diags = 1 "default 1
+
+
+let g:ycm_complete_in_strings = 1 "default 1
+let g:ycm_collect_identifiers_from_tags_files = 0 "default 0
+let g:ycm_path_to_python_interpreter = '' "default ''
+
+
+let g:ycm_server_use_vim_stdout = 0 "default 0 (logging to console)
+let g:ycm_server_log_level = 'info' "default info
+
+
+let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'  "where to search for .ycm_extra_conf.py if not found
+let g:ycm_confirm_extra_conf = 0
+
+
+let g:ycm_goto_buffer_command = 'same-buffer' "[ 'same-buffer', 'horizontal-split', 'vertical-split', 'new-tab' ]
+let g:ycm_filetype_whitelist = { '*': 1 }
+let g:ycm_key_invoke_completion = '<C-Space>'
+
+
+nnoremap <leader>r :YcmForceCompileAndDiagnostics <CR>
-- 
cgit v1.2.3-54-g00ecf