diff --git a/vim/vimrc b/vim/vimrc index 9b9948b..cf3fc88 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -110,11 +110,35 @@ let g:SuperTabDefaultCompletionType = "" Plugin 'alvan/vim-closetag' let g:jedi#documentation_command = "" let g:closetag_filenames = '*.html,*.xhtml,*.phtml,*.launch,*.vue' -Plugin 'marijnh/tern_for_vim' Plugin 'jiangmiao/auto-pairs' -Plugin 'othree/javascript-libraries-syntax.vim' -let g:used_javascript_libs = 'vue' +Plugin 'valloric/matchtagalways' +let g:mta_filetypes = { + \ '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 +Plugin 'marijnh/tern_for_vim' +autocmd FileType javascript nnoremap :TernDef +autocmd FileType vue.javascript nnoremap :TernDef +" vue 补全js +autocmd BufEnter,BufRead *.vue set filetype=vue.javascript + +Plugin 'prettier/vim-prettier', { 'do': 'yarn install' } +" 项目目录下配置 ..prettierrc.json +" { +" singleQuote": true, +" semi": false +" } + + @@ -205,8 +229,6 @@ let g:go_def_mode="godef" "Plugin 'https://github.com/taketwo/vim-ros.git' -Plugin 'ctrlpvim/ctrlp.vim' - Plugin 'terryma/vim-multiple-cursors' "Plugin 'Shougo/neocomplete.vim' @@ -385,9 +407,6 @@ 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 -" vue 补全js -autocmd BufEnter,BufRead *.vue set filetype=vue.javascript -autocmd FileType vue syntax sync fromstart au BufNewFile,BufRead *.launch,*.urdf set filetype=xml