Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tabnine #579

Merged
merged 7 commits into from
Dec 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 23 additions & 12 deletions .vim/rc/pluginconfig.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1067,11 +1067,13 @@ if s:plug.is_installed('vim-session')
" session保存ディレクトリをそのディレクトリの設定
let g:session_directory = a:dir
" vimを辞める時に自動保存
let g:session_autosave = 'yes'
" let g:session_autosave = 'yes'
" 引数なしでvimを起動した時にsession保存ディレクトリのdefault.vimを開く
let g:session_autoload = 'yes'
"let g:session_autoload = 'yes'
" 1分間に1回自動保存
let g:session_autosave_periodic = 1
" let g:session_autosave_periodic = 1
let g:session_autosave = 'no'
let g:session_autoload = 'no'
endfunction
" 現在のディレクトリ直下の .vimsessions/ を取得
let s:local_session_directory =
Expand Down Expand Up @@ -1463,15 +1465,24 @@ if s:plug.is_installed('LanguageClient-neovim')

let s:lsp_filetypes = join(keys(g:LanguageClient_serverCommands), ",")
if s:lsp_filetypes != ""
augroup MyLanguageClient
execute 'autocmd FileType ' . s:lsp_filetypes . ' nnoremap <silent> <S-F5> :call LanguageClient_contextMenu()<CR>'
execute 'autocmd FileType ' . s:lsp_filetypes . ' nnoremap <silent> gh :call LanguageClient_textDocument_hover()<CR>'
execute 'autocmd FileType ' . s:lsp_filetypes . ' nnoremap <silent> gd :call LanguageClient_textDocument_definition()<CR>'
execute 'autocmd FileType ' . s:lsp_filetypes . ' nnoremap <silent> gr :call LanguageClient#textDocument_references()<CR>'
execute 'autocmd FileType ' . s:lsp_filetypes . ' nnoremap <silent> gs :call LanguageClient#textDocument_documentSymbol()<CR>'
execute 'autocmd FileType ' . s:lsp_filetypes . ' nnoremap <silent> <S-F6> :call LanguageClient_textDocument_rename()<CR>'
augroup END
endif
function SetLSPShortcuts()
nnoremap <leader>ld :call LanguageClient#textDocument_definition()<CR>
nnoremap <leader>lr :call LanguageClient#textDocument_rename()<CR>
nnoremap <leader>lf :call LanguageClient#textDocument_formatting()<CR>
nnoremap <leader>lt :call LanguageClient#textDocument_typeDefinition()<CR>
nnoremap <leader>lx :call LanguageClient#textDocument_references()<CR>
nnoremap <leader>la :call LanguageClient_workspace_applyEdit()<CR>
nnoremap <leader>lc :call LanguageClient#textDocument_completion()<CR>
nnoremap <leader>lh :call LanguageClient#textDocument_hover()<CR>
nnoremap <leader>ls :call LanguageClient_textDocument_documentSymbol()<CR>
nnoremap <leader>lm :call LanguageClient_contextMenu()<CR>
endfunction()

augroup LSP
autocmd!
execute 'autocmd FileType ' . s:lsp_filetypes . ' call SetLSPShortcuts()'
augroup END
endif
endif

"-------------------------------------------------------------
Expand Down
20 changes: 17 additions & 3 deletions .vim/rc/pluginlist.vim
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,12 @@ Plug 'AndrewRadev/linediff.vim'

"------------------------------
" Map
Plug 'kshenoy/vim-signature'
Plug 'tpope/vim-unimpaired'

"------------------------------
" Mark
Plug 'kshenoy/vim-signature'

"------------------------------
" Tab
Plug 'kana/vim-tabpagecd'
Expand All @@ -177,9 +180,12 @@ Plug 'skywind3000/gutentags_plus', {

"------------------------------
" Session
"Plug 'xolox/vim-session'
Plug 'xolox/vim-session'
"depend 'xolox/vim-misc'
"Plug 'xolox/vim-misc'
Plug 'xolox/vim-misc'

"------------------------------
" StartMenu
Plug 'mhinz/vim-startify'

"------------------------------
Expand Down Expand Up @@ -361,6 +367,14 @@ Plug 'Shougo/echodoc.vim'
Plug 'Shougo/neco-syntax'
Plug 'Shougo/neoinclude.vim'

"------------------------------
" Tabnine
if (s:deoplete_enable == 1)
Plug 'tbodt/deoplete-tabnine', { 'do': './install.sh' }
else
Plug 'zxqfl/tabnine-vim'
endif

"------------------------------
" Project
Plug 'airblade/vim-rooter'
Expand Down
6 changes: 4 additions & 2 deletions .xprofile
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ if [ -f $usermodmap ]; then
fi

xset -b
xset s off
xset s 900 1200 1800
xset s blank
xset s 900 1200
xset +dpms
xset dpms 900 1200 1800

if builtin command -v "synclient" > /dev/null 2>&1; then
LEFT_EDGE=$(synclient | \grep -w LeftEdge | awk '{print $3}')
Expand Down