Vim: Minor JS+TS ftplugin fixups. Adds a CA-specific yarn shortcut.

damncabbage · Jun 15, 2021 · def076a · def076a
1 parent 84f1896
commit def076a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.vim/ftplugin/javascript.vim b/.vim/ftplugin/javascript.vim
@@ -8,7 +8,7 @@ function! AddJsDebug()
   " TODO: debounce?
   call add(debug_method_code, "  var cl = (new Error).stack.split(\"\\n\")[2]")
   call add(debug_method_code, "  var index = cl.indexOf('at ')")
-	call add(debug_method_code, "  var clClean = cl.slice(index+3, cl.length)")
+  call add(debug_method_code, "  var clClean = cl.slice(index+3, cl.length)")
   call add(debug_method_code, "  console.log('[' + clClean + '] [' + name + ']:', val)")
   call add(debug_method_code, "  return val")
   call add(debug_method_code, "}")
@@ -17,7 +17,7 @@ function! AddJsDebug()
   " Save cursor position to restore at the end of the function.
   let save_cursor = getcurpos()
 
-  " 1) Add the debug line to the top of the Ruby file, so it's available in
+  " 1) Add the debug line to the top of the JS file, so it's available in
   "    later code, if we haven't already added it.
   call cursor(1, 1)
   let debug_find_result = search('\V' . minified_debug, 'c')
@@ -93,3 +93,6 @@ function! AddJsDebug()
 endfunction
 
 nnoremap <leader>dd :call AddJsDebug()<CR>
+
+" Lint Fix
+nmap <leader>ll :!eslint --fix %<CR>
diff --git a/.vim/ftplugin/typescript.vim b/.vim/ftplugin/typescript.vim
@@ -0,0 +1,11 @@
+" Lint Fix
+nnoremap <leader>ll :!eslint --fix %<CR>
+
+" Culture Amp 'frontend-ops'-specific D:
+" (frontend-ops has package/* and example/* workspaces set up, so I want to be
+" able to quickly run jest and other commands on things within those
+" workspaces.)
+nnoremap <leader>yy :!yarn <C-R>=expand("%:gs?\\([^/][^/]*/[^/][^/]*\\)/.*?\\1?") . ' '<CR>
+nnoremap <leader>yj :!yarn <C-R>=expand("%:gs?\\([^/][^/]*/[^/][^/]*\\)/.*?\\1?") . ' jest %'<CR>
+nnoremap <leader>ys :!yarn <C-R>=expand("%:gs?\\([^/][^/]*/[^/][^/]*\\)/.*?\\1?") . ' jest %'<CR><CR>
+
diff --git a/.vimrc b/.vimrc
@@ -78,7 +78,6 @@ Plug 'mxw/vim-jsx', { 'for': ['javascript', 'javascript.jsx'] }
 Plug 'leafgarland/typescript-vim', { 'for': 'typescript' }
 
 Plug 'prettier/vim-prettier', {
-  \ 'branch': 'issue/232-adding-support-for-prettier-2.x',
   \ 'do': 'yarn install',
   \ 'for': ['javascript', 'javascript.jsx', 'typescript'] }
 " TODO: Try: