Skip to content

Commit

Permalink
Fix completor.vim completion
Browse files Browse the repository at this point in the history
Signed-off-by: Tomas Slusny <[email protected]>
  • Loading branch information
deathbeam committed Apr 7, 2017
1 parent 323cf04 commit 5a28f3f
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 15 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ creating appropriate `.local` dotfiles in home directory:

$EDITOR ~/.gitconfig.local
$EDITOR ~/.vimrc.local
$EDITOR ~/.profile.local
$EDITOR ~/.zshrc.local
$EDITOR ~/.tmux.conf.local

Expand Down
2 changes: 1 addition & 1 deletion vim/.vim/bundle/syntastic
2 changes: 1 addition & 1 deletion vim/.vim/bundle/vim-fugitive
Submodule vim-fugitive updated 1 files
+6 −0 plugin/fugitive.vim
2 changes: 1 addition & 1 deletion vim/.vim/bundle/vim-snippets
2 changes: 1 addition & 1 deletion vim/.vim/bundle/vim-test
2 changes: 2 additions & 0 deletions vim/.vim/ftplugin/html.vim
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
setlocal omnifunc=htmlcomplete#CompleteTags

" Syntastic adjustments
let g:syntastic_html_checkers = ['htmlhint']
14 changes: 9 additions & 5 deletions vim/.vim/ftplugin/java.vim
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
setlocal omnifunc=javacomplete#Complete
let g:JavaComplete_ImportSortType = 'packageName'
let g:JavaComplete_ImportOrder = ['*']
set makeprg=mvn\ $*
set errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m,
setlocal makeprg=mvn\ $*
setlocal errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m,
\\[%t%[A-Z]%#]\ %f:%l:\ %m,
\\%A%f:[%l\\,%c]\ %m,
\\%Csymbol%.%#:\ %m,
Expand All @@ -18,4 +16,10 @@ set errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m,
\\%+ZTests\ run%.%#FAILURE!%.%#,
\\%-G%.%#

let g:completor_java_omni_trigger = '\w+$|[\w\)\]\}\\\'\"]+\.\w*$'
" Completor integration
let g:completor_java_omni_trigger = '(\w+|[^\. \t0-9]+\.\w*)$'

" JavaComplete adjustments
let g:JavaComplete_ImportSortType = 'packageName'
let g:JavaComplete_ImportOrder = ['*']

7 changes: 3 additions & 4 deletions vim/.vim/ftplugin/typescript.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
" Deoplete plugin integration
let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
let g:deoplete#omni#input_patterns.typescript = ['[^. \t0-9]\.\w*']
" Completor integration
let g:completor_typescript_omni_trigger = '(\w+|[^\. \t0-9]+\.\w*)$'

" Tsuquyomi and synstatic integration
" Tsuquyomi and syntastic integration
let g:tsuquyomi_disable_quickfix = 1
let g:syntastic_typescript_checkers = ['tsuquyomi']
1 change: 1 addition & 0 deletions vim/.vim/ftplugin/vim.vim
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
" Syntastic integration
let g:syntastic_vim_checkers = ['vint']
2 changes: 1 addition & 1 deletion zsh/.fzf
Submodule .fzf updated 1 files
+1 −1 README.md
2 changes: 2 additions & 0 deletions zsh/.profile
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ export LC_ALL="en_US.UTF-8"
# Preferred editor for local and remote sessions
export EDITOR="vim"
export VISUAL="$EDITOR"

[[ -f "~/.profile.local" ]] && source "~/.profile.local"

0 comments on commit 5a28f3f

Please sign in to comment.