From 4b3d3956afa066729a2ce2b13faf6769c8a3cd5d Mon Sep 17 00:00:00 2001
From: light <1870499383@qq.com>
Date: Fri, 31 May 2019 00:29:00 +0800
Subject: [PATCH] update vim

---
 vim/vimrc | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index cf3fc88..d209b42 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -37,11 +37,11 @@ let g:ale_echo_msg_format = '[%linter%] %s [%severity%]'
 let s:error_symbol = get(g:, 'airline#extensions#ale#error_symbol', 'E:')
 let s:warning_symbol = get(g:, 'airline#extensions#ale#warning_symbol', 'W:')
 let g:ale_linters = {
-\               'c++': ['clang'],
-\ 'c': ['clang'],
-\              'python': ['flake8'],
-\  'vue':['eslint'],
-\            }
+            \               'c++': ['clang'],
+            \ 'c': ['clang'],
+            \              'python': ['flake8'],
+            \  'vue':['eslint'],
+            \            }
 "普通模式下，ep前往上一个错误或警告，en前往下一个错误或警告
 nmap ep <Plug>(ale_previous_wrap)
 nmap en <Plug>(ale_next_wrap)
@@ -106,30 +106,38 @@ let g:SuperTabDefaultCompletionType = "<c-n>"
 
 " 前端
 " xml html auto close
-" js 补全 
+" js 补全
 Plugin 'alvan/vim-closetag'
 let g:jedi#documentation_command = ""
 let g:closetag_filenames = '*.html,*.xhtml,*.phtml,*.launch,*.vue'
 Plugin 'jiangmiao/auto-pairs'
 Plugin 'valloric/matchtagalways'
 let g:mta_filetypes = {
-    \ 'html' : 1,
-    \ 'xhtml' : 1,
-    \ 'xml' : 1,
-    \ 'jinja' : 1,
-    \ 'vue.javascript' : 1,
-    \}
+            \ 'html' : 1,
+            \ 'xhtml' : 1,
+            \ 'xml' : 1,
+            \ 'jinja' : 1,
+            \ 'vue.javascript' : 1,
+            \}
 
 " css 颜色
 Plugin 'ap/vim-css-color'
 Plugin 'posva/vim-vue'
 " vue 解决语法高亮部分失效
-autocmd FileType vue.javascript syntax sync fromstart
+"let g:vue_disable_pre_processors=1
+"autocmd FileType vue.html.javascript.css.less.pug syntax sync fromstart
+"autocmd BufRead,BufNewFile *.vue setlocal filetype=vue.html.javascript.css.pug
+
 Plugin 'marijnh/tern_for_vim'
+" 鼠标停留在方法内时显示参数提示
+let g:tern_show_argument_hints = 'on_hold'
+" 补全时显示函数类型定义
+let g:tern_show_signature_in_pum = 1
+
 autocmd FileType javascript nnoremap <buffer> <c-]> :TernDef<CR>
 autocmd FileType vue.javascript nnoremap <buffer> <c-]> :TernDef<CR>
-" vue  补全js 
-autocmd BufEnter,BufRead *.vue set filetype=vue.javascript
+" vue  补全js
+autocmd BufRead,BufNewFile *.vue setlocal filetype=vue.javascript
 
 Plugin 'prettier/vim-prettier', { 'do': 'yarn install' }
 " 项目目录下配置 ..prettierrc.json
@@ -398,8 +406,11 @@ if has("autocmd")
 endif
 
 
-colorscheme slate
-highlight Comment ctermfg=blue
+colorscheme desert
+"autocmd BufEnter
+au BufNewFile,BufRead  *.go highlight Character ctermfg=6 guifg=SkyBlue
+"autocmd BufEnter * colorscheme desert
+"autocmd BufEnter go colorscheme slate
 
 au BufNewFile,BufRead *.html,*.js,*.vue set tabstop=2
 au BufNewFile,BufRead *.html,*.js,*.vue set softtabstop=2
@@ -407,6 +418,7 @@ au BufNewFile,BufRead *.html,*.js,*.vue set shiftwidth=2
 au BufNewFile,BufRead *.html,*.js,*.vue set expandtab
 au BufNewFile,BufRead *.html,*.js,*.vue set autoindent
 au BufNewFile,BufRead *.html,*.js,*.vue set fileformat=unix
+au BufNewFile,BufRead *.vue syntax sync fromstart
 
 
 au BufNewFile,BufRead *.launch,*.urdf  set filetype=xml