diff --git a/after/plugin/plugin_settings.vim b/after/plugin/plugin_settings.vim index adbc928..ff88bd2 100644 --- a/after/plugin/plugin_settings.vim +++ b/after/plugin/plugin_settings.vim @@ -3,149 +3,6 @@ let g:echodoc#enable_at_startup = 1 let g:echodoc#type = 'signature' - -" function! ConfigureCocNVIM() -" " ============ coc.nvim =========== - " " if hidden is not set, TextEdit might fail. - " set hidden - - " " Some servers have issues with backup files, see #649 - " set nobackup - " set nowritebackup - - " " Better display for messages - " "set cmdheight=2 - - " " You will have bad experience for diagnostic messages when it's default 4000. - " set updatetime=300 - - " " don't give |ins-completion-menu| messages. - " set shortmess+=c - - " " always show signcolumns - " set signcolumn=yes - - " " Use tab for trigger completion with characters ahead and navigate. - " " Use command ':verbose imap ' to make sure tab is not mapped by other plugin. - " inoremap - " \ pumvisible() ? "\" : - " \ check_back_space() ? "\" : - " \ coc#refresh() - " inoremap pumvisible() ? "\" : "\" - - " function! s:check_back_space() abort - " let col = col('.') - 1 - " return !col || getline('.')[col - 1] =~# '\s' - " endfunction - - " " Use to trigger completion. - " inoremap coc#refresh() - - " " Use to confirm completion, `u` means break undo chain at current position. - " " Coc only does snippet and additional edit on confirm. - " inoremap pumvisible() ? "\" : "\u\" - " " Or use `complete_info` if your vim support it, like: - " " inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" - - " " Use `[g` and `]g` to navigate diagnostics - " nmap ,g (coc-diagnostic-prev) - " nmap .g (coc-diagnostic-next) - - " " Remap keys for gotos - " nmap gd (coc-definition) - " nmap gy (coc-type-definition) - " nmap gi (coc-implementation) - " nmap gr (coc-references) - - " " Use K to show documentation in preview window - " nnoremap K :call show_documentation() - - " function! s:show_documentation() - " if (index(['vim','help'], &filetype) >= 0) - " execute 'h '.expand('') - " else - " call CocActionAsync('doHover') - " endif - " endfunction - - " " Highlight symbol under cursor on CursorHold - " autocmd CursorHold * silent call CocActionAsync('highlight') - - " " Remap for rename current word - " nmap rn (coc-rename) - - " " Remap for format selected region - " " xmap f (coc-format-selected) - " " nmap f (coc-format-selected) - - " augroup mygroup - " autocmd! - " " Setup formatexpr specified filetype(s). - " autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') - " " Update signature help on jump placeholder - " autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') - " augroup end - - " " Remap for do codeAction of selected region, ex: `aap` for current paragraph - " xmap a (coc-codeaction-selected) - " nmap a (coc-codeaction-selected) - - " " Remap for do codeAction of current line - " nmap ac (coc-codeaction) - " " Fix autofix problem of current line - " nmap qf (coc-fix-current) - - " " Create mappings for function text object, requires document symbols feature of languageserver. - " xmap if (coc-funcobj-i) - " xmap af (coc-funcobj-a) - " omap if (coc-funcobj-i) - " omap af (coc-funcobj-a) - - " " Use for select selections ranges, needs server support, like: coc-tsserver, coc-python - " nmap (coc-range-select) - " xmap (coc-range-select) - - " " Use `:Format` to format current buffer - " command! -nargs=0 Format :call CocAction('format') - - " " Use `:Fold` to fold current buffer - " command! -nargs=? Fold :call CocAction('fold', ) - - " " use `:OR` for organize import of current buffer - " command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') - - " " Add status line support, for integration with other plugin, checkout `:h coc-status` - " set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} - - " " Using CocList - " " Show all diagnostics - " nnoremap .a :CocList diagnostics - " " Manage extensions - " nnoremap .e :CocList extensions - " " Show commands - " nnoremap c :CocList commands - " " Find symbol of current document - " nnoremap .o :CocList outline - " " Search workspace symbols - " nnoremap s :CocList -I symbols - " " Do default action for next item. - " nnoremap j :CocNext - " " Do default action for previous item. - " nnoremap k :CocPrev - " " Resume latest coc list - " nnoremap p :CocListResume -" endfunction - - -" autocmd! User coc.nvim call ConfigureCocNVIM() - -" function s:CocStop() - " :CocDisable - " call coc#rpc#start_server() -" endfunction - -" command! -nargs=0 CocStop :call s:CocStop() - "LanguageClient-neovim " Required for operations modifying multiple buffers like rename. set hidden diff --git a/coc-settings.json b/coc-settings.json deleted file mode 100644 index d22fc66..0000000 --- a/coc-settings.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "languageserver": { - "haskell": { - "trace.server": "verbose", - "command": "haskell-language-server-wrapper", - "args": ["--lsp", "-d", "-l", "/home/jule/hls-server.log"], - "rootPatterns": [ - "*.cabal", - "stack.yaml", - "cabal.config", - "cabal.project", - "package.yaml" - ], - "filetypes": [ - "hs", - "lhs", - "haskell" - ], - "initializationOptions": { - "languageServerHaskell": { - "hlintOn": true - } - } - }, - "bash": { - "trace.server": "verbose", - "command": "bash-language-server", - "args": ["start"], - "filetypes": ["sh"], - "ignoredRootPaths": ["~"] - }, - // install: https://github.com/mattn/efm-langserver - // and: https://github.com/Kuniwak/vint - "efm": { - "command": "efm-langserver", - "args": [], - // custom config path - //"args": ["-c", "/home/jule/.config/efm-langserver/config.yaml"], - "filetypes": ["vim"] - }, - "python": { - "command": "python", - "args": [ - "-mpyls", - "-vv", - "--log-file", - "/tmp/lsp_python.log" - ], - "trace.server": "verbose", - "filetypes": [ - "python" - ], - "settings": { - "pyls": { - "enable": true, - "trace": { - "server": "verbose" - }, - "commandPath": "", - "configurationSources": [ - "pycodestyle" - ], - "plugins": { - "jedi_completion": { - "enabled": true - }, - "jedi_hover": { - "enabled": true - }, - "jedi_references": { - "enabled": true - }, - "jedi_signature_help": { - "enabled": true - }, - "jedi_symbols": { - "enabled": true, - "all_scopes": true - }, - "mccabe": { - "enabled": true, - "threshold": 15 - }, - "preload": { - "enabled": true - }, - "pycodestyle": { - "enabled": true - }, - "pydocstyle": { - "enabled": false, - "match": "(?!test_).*\\.py", - "matchDir": "[^\\.].*" - }, - "pyflakes": { - "enabled": true - }, - "rope_completion": { - "enabled": true - }, - "yapf": { - "enabled": true - } - } - } - } - } - }, - "coc.preferences.hoverTarget": "float", - "diagnostic.virtualText": true, - "diagnostic.enableSign": true, - "suggest.floatEnable": true -} - diff --git a/vimrc b/vimrc index 0b78cb3..9853e29 100644 --- a/vimrc +++ b/vimrc @@ -170,21 +170,6 @@ endif " Plug 'noahfrederick/vim-hemisu' " Plug 'morhetz/gruvbox' -" coc -" Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell', 'rust', 'sh', 'python', 'vim']} -" Plug 'neoclide/coc-tsserver', {'do': 'yarn install --frozen-lockfile', 'for': ['typescript']} -" "Plug 'neoclide/coc-git', {'do': 'yarn install --frozen-lockfile'} -" " Plug 'neoclide/coc-rls', {'do': 'yarn install --frozen-lockfile', 'for': ['rust']} -" Plug 'fannheyward/coc-rust-analyzer', {'do': 'yarn install --frozen-lockfile', 'for': ['rust']} -" Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell', 'rust', 'sh']} -" " Plug 'neoclide/coc-python', {'do': 'yarn install --frozen-lockfile', 'for': ['python']} -" "Plug 'neoclide/coc-vetur', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -" Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile', 'for': ['json']} -" " Plug 'neoclide/coc-eslint', {'do': 'yarn install --frozen-lockfile', 'for': ['']} -" Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile', 'for': ['yaml']} -" " Plug 'neoclide/coc-highlight', {'do': 'yarn install --frozen-lockfile', 'for': ['']} -" Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile', 'for': ['']} - " unmanaged Plug '~/.vim/unmanaged-vim-plug/bufonly' Plug '~/.vim/unmanaged-vim-plug/colorschemedegrade'