updates

Author: flybayer

coc-settings.json

@@ -1,12 +1,9 @@
 {
-  "coc.preferences.snippets.enable": false,
   "diagnostic.refreshOnInsertMode": true,
   "suggest.noselect": false,
   "diagnostic.enableSign": false,
-  "diagnostic.maxWindowHeight": 40,
-  "coc.preferences.previewMaxHeight": 40,
-  "signature.maxWindowHeight": 40,
-  "list.maxHeight": 40,
+  "coc.preferences.formatOnSaveFiletypes": ["*"],
   "list.maxPreviewHeight": 40,
-  "tailwindCSS.headwind.runOnSave": false
+  "tailwindCSS.headwind.runOnSave": false,
+  "eslint.autoFixOnSave": true
 }

colors/zenfly.vim

@@ -101,13 +101,9 @@ hi GitGutterDelete guifg=red
 hi diffRemoved guifg=red
 hi diffAdded guifg=green
 
-hi link CocErrorHighlight ALEError
-hi link CocWarningHighlight ALEWarning
-hi link CocInfoHighlight ALEWarning
-
-hi CocWarningFloat guifg=#000000
-hi CocInfoFloat guifg=#000000
-
 hi rustStorage gui=italic
 hi rustRepeat gui=bold
 
+
+" NOTE - COC colors set in coc.vim so they have highest priority
+

init.vim

@@ -19,7 +19,7 @@ endif
 " All of the Plug plugins are loaded with Plug from this file.
 source ~/.vim/plug.vim
 
-" Platform (Windows, Mac, etc.) configuration.
+"Platform (Windows, Mac, etc.) configuration.
 source ~/.vim/platforms.vim
 " All of the Vim configuration.
 source ~/.vim/config.vim

plug_ins/ale.vim renamed to plug_ins/ale.vim.disable

@@ -38,18 +38,18 @@ let g:ale_linters['graphql'] = []
 let g:ale_linters['rust'] = ['rls']
 
 let g:ale_fixers = {}
-let g:ale_fixers['javascript'] = ['prettier', 'eslint']
-let g:ale_fixers['typescript'] = ['prettier', 'eslint']
-let g:ale_fixers['typescriptreact'] = ['prettier', 'eslint']
-let g:ale_fixers['markdown'] = ['prettier']
-let g:ale_fixers['html'] = ['prettier']
-let g:ale_fixers['ruby'] = ['prettier']
-let g:ale_fixers['json'] = ['prettier']
-let g:ale_fixers['graphql'] = ['prettier']
-let g:ale_fixers['scss'] = ['prettier']
-let g:ale_fixers['css'] = ['prettier']
+let g:ale_fixers['javascript'] = [ 'eslint']
+let g:ale_fixers['typescript'] = [ 'eslint']
+let g:ale_fixers['typescriptreact'] = [ 'eslint']
+" let g:ale_fixers['markdown'] = ['prettier']
+" let g:ale_fixers['html'] = ['prettier']
+" let g:ale_fixers['ruby'] = ['prettier']
+" let g:ale_fixers['json'] = ['prettier']
+" let g:ale_fixers['graphql'] = ['prettier']
+" let g:ale_fixers['scss'] = ['prettier']
+" let g:ale_fixers['css'] = ['prettier']
 let g:ale_fixers['rust'] = ['rustfmt']
-let g:ale_fixers['prisma'] = ['prettier']
+" let g:ale_fixers['prisma'] = ['prettier']
 
 " let g:ale_javascript_prettier_executable = 'prettier_d'
 " let g:ale_javascript_prettier_use_global = 1

plug_ins/coc.vim

@@ -8,16 +8,21 @@ endif
 " ----------------------
 let g:coc_global_extensions = ['coc-css', 'coc-html', 'coc-json', 'coc-prisma', 'coc-rls', 'coc-tsserver', 'coc-pairs', 'coc-tailwindcss', 'coc-yaml']
 
+" let g:coc_filetype_map = { 'markdown.mdx': 'mdx' }
+
 " don't give |ins-completion-menu| messages.
 set shortmess+=c
 
 " Use tab for trigger completion with characters ahead and navigate.
-" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin.
+" NOTE: There's always complete item selected by default, you may want to enable
+" no select by `"suggest.noselect": true` in your configuration file.
+" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
+" other plugin before putting this into your config.
 inoremap <silent><expr> <TAB>
-      \ pumvisible() ? "\<C-n>" :
-      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#pum#visible() ? coc#pum#next(1) :
+      \ CheckBackspace() ? "\<Tab>" :
       \ coc#refresh()
-inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
 
 function! s:check_back_space() abort
   let col = col('.') - 1
@@ -27,11 +32,10 @@ endfunction
 " Use <c-space> to trigger completion.
 inoremap <silent><expr> <c-space> coc#refresh()
 
-" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
-" Coc only does snippet and additional edit on confirm.
-" inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
-" Or use `complete_info` if your vim support it, like:
-inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
+" Make <CR> to accept selected completion item or notify coc.nvim to format
+" <C-g>u breaks current undo, please make your own choice.
+inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
+                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
 " Use `[g` and `]g` to navigate diagnostics
 nmap <silent> [g <Plug>(coc-diagnostic-prev)
@@ -57,6 +61,13 @@ endfunction
 " Highlight symbol under cursor on CursorHold
 " autocmd CursorHold * silent call CocActionAsync('highlight')
 
+hi CocErrorHighlight guifg=#ffffff guibg=#fca5a5
+hi CocWarningHighlight guifg=#ffffff guibg=#f59e0b
+hi CocInfoHighlight guifg=#ffffff guibg=#f59e0b
+hi CocWarningFloat guifg=#000000
+hi CocInfoFloat guifg=#000000
+
+
 " Remap for rename current word
 nmap <leader>rn <Plug>(coc-rename)
 
@@ -120,3 +131,7 @@ nnoremap <silent> <leader>j  :<C-u>CocNext<CR>
 nnoremap <silent> <leader>k  :<C-u>CocPrev<CR>
 " Resume latest coc list
 " nnoremap <silent> <leader>p  :<C-u>CocListResume<CR>
+
+
+" autoformat
+command! -nargs=0 Prettier :CocCommand prettier.forceFormatDocument

plug_ins/vim-mdx-js.vim

@@ -1,4 +1,4 @@
-let g:polyglot_disabled = ['javascript', 'jsx', 'csv']
+let g:polyglot_disabled = ['javascript', 'jsx', 'csv', 'mdx']
 
 if exists('g:plug_loading_plugins')
   Plug 'sheerun/vim-polyglot'
@@ -9,5 +9,4 @@ nnoremap <A-r> :RustRun<cr>
 let g:rustfmt_fail_silently = 1
 
 " let g:javascript_plugin_flow = 1
-" let g:polyglot_disabled = ['csv']
-let g:vim_markdown_frontmatter = 1
+" let g:vim_markdown_frontmatter = 1