add coc-sh and plugin vim-shellcheck

This commit is contained in:
Ray Elliott 2020-08-14 21:18:52 +01:00
parent 58f116db7a
commit 01c728204b
3 changed files with 9 additions and 18 deletions

View File

@ -23,6 +23,8 @@
"python.formatting.provider": "black", "python.formatting.provider": "black",
"python.formatting.blackPath": "/home/ray/.local/bin/black", "python.formatting.blackPath": "/home/ray/.local/bin/black",
"coc.preferences.formatOnSaveFiletypes": ["python", "vue"], "coc.preferences.formatOnSaveFiletypes": ["python", "vue"],
"sh.enable": true,
"sh.highlightParsingErrors": true,
"eslint.enable": true, "eslint.enable": true,
"eslint.autoFixOnSave": true, "eslint.autoFixOnSave": true,

View File

@ -26,7 +26,6 @@ call plug#begin('~/.config/nvim/bundle')
" inoremap <silent><expr> <c-n> coc#refresh() " inoremap <silent><expr> <c-n> coc#refresh()
nnoremap <silent> <silent> <space><space> :call CocAction('doHover')<CR> nnoremap <silent> <silent> <space><space> :call CocAction('doHover')<CR>
nnoremap <silent> <silent> <space>cc :call CocAction('doHover')<CR>
nnoremap <silent> <space>cf :call CocAction('doQuickfix')<CR> nnoremap <silent> <space>cf :call CocAction('doQuickfix')<CR>
nnoremap <silent> <space>cg :call CocAction('jumpDefinition')<CR> nnoremap <silent> <space>cg :call CocAction('jumpDefinition')<CR>
nnoremap <silent> <space>ci :call CocAction('jumpImplementation')<CR> nnoremap <silent> <space>ci :call CocAction('jumpImplementation')<CR>
@ -37,8 +36,6 @@ call plug#begin('~/.config/nvim/bundle')
nnoremap <silent> <space>cS :call CocAction('workspaceSymbols')<CR> nnoremap <silent> <space>cS :call CocAction('workspaceSymbols')<CR>
nnoremap <silent> ]c :call CocAction('diagnosticNext')<CR> nnoremap <silent> ]c :call CocAction('diagnosticNext')<CR>
nnoremap <silent> [c :call CocAction('diagnosticPrevious')<CR> nnoremap <silent> [c :call CocAction('diagnosticPrevious')<CR>
" vnoremap \f <Plug>(coc-format-selected)
" nnoremap \f <Plug>(coc-format-selected)
command! -nargs=0 Format :call CocAction('format') command! -nargs=0 Format :call CocAction('format')
command! -nargs=? Fold :call CocAction('fold', <f-args>) command! -nargs=? Fold :call CocAction('fold', <f-args>)
@ -257,6 +254,12 @@ let g:mta_filetypes = {
Plug 'studio-vx/Vim-Jinja2-Syntax' Plug 'studio-vx/Vim-Jinja2-Syntax'
"}}} "}}}
" #vim-shellcheck{{{
" https://github.com/itspriddle/vim-shellcheck
Plug 'itspriddle/vim-shellcheck'
"}}}
" #vim-SyntaxRange{{{ " #vim-SyntaxRange{{{
" https://github.com/inkarkat/vim-SyntaxRange " https://github.com/inkarkat/vim-SyntaxRange
" Plug 'inkarkat/vim-SyntaxRange' " Plug 'inkarkat/vim-SyntaxRange'
@ -379,7 +382,7 @@ let g:vim_markdown_fenced_languages = ['bash=sh']
call plug#end() call plug#end()
runtime macros/matchit.vim runtime macros/matchit.vim
" TODO - try 'coc-tsserver' " TODO - try 'coc-tsserver'
call coc#add_extension( 'coc-vetur', 'coc-python', 'coc-phpls', 'coc-json', 'coc-css', 'coc-prettier', 'coc-eslint', 'coc-vimlsp', 'coc-tsserver') call coc#add_extension( 'coc-vetur', 'coc-python', 'coc-phpls', 'coc-json', 'coc-css', 'coc-prettier', 'coc-eslint', 'coc-vimlsp', 'coc-tsserver', 'coc-sh')

View File

@ -160,18 +160,6 @@ command! -nargs=1 -complete=command Redir silent call Redir(<q-args>)
" :Redir hi ............. show the full output of command ':hi' in a scratch window " :Redir hi ............. show the full output of command ':hi' in a scratch window
" :Redir !ls -al ........ show the full output of command ':!ls -al' in a scratch window " :Redir !ls -al ........ show the full output of command ':!ls -al' in a scratch window
"}}} "}}}
function! AleLinterStatus() abort "{{{
let l:counts = ale#statusline#Count(bufnr(''))
let l:all_errors = l:counts.error + l:counts.style_error
let l:all_non_errors = l:counts.total - l:all_errors
return l:counts.total == 0 ? '' : printf(
\ '[ %dW %dE ]',
\ all_non_errors,
\ all_errors
\)
endfunction
"}}} "}}}
function! ToggleHighlights() abort "{{{ function! ToggleHighlights() abort "{{{
if ! exists('b:toggle_highlights_state') if ! exists('b:toggle_highlights_state')
@ -324,8 +312,6 @@ set statusline+=%-20(%l\ of\ %L\ (%p%%)%)
set statusline+=%-10(:%c\ %((%V)%)%) set statusline+=%-10(:%c\ %((%V)%)%)
" separator, highlight color " separator, highlight color
set statusline+=%=%#StatusLineNC# set statusline+=%=%#StatusLineNC#
" Ale errors
set statusline+=%{AleLinterStatus()}\
" CoC status " CoC status
set statusline+=%{coc#status()} set statusline+=%{coc#status()}
" separator " separator