d38d836fda13

more shit
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Wed, 14 May 2014 12:31:30 -0400
parents 2c4aba25376c
children 4cb426ba4935
branches/tags (none)
files .hgsubstate bin/myctags dotjs/jenkins.banksimple.com.js vim/vimrc

Changes

--- a/.hgsubstate	Tue Apr 22 18:23:20 2014 -0400
+++ b/.hgsubstate	Wed May 14 12:31:30 2014 -0400
@@ -31,7 +31,7 @@
 1b4b8f1a8f1c88d8caae6c1b12c22c52ef418f32 vim/bundle/python-mode
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
-cfc1a90540f648492086a20e39fde7514c469fa7 vim/bundle/scala
+b87b9164084c093e0cbd5bff08dbbe01ea59d412 vim/bundle/scala
 1f797fda2c457202cf62d9a082a3fccd4278e3bf vim/bundle/scaladoc
 10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
 0377b100382c19295b42018289fe8d42a7d57e80 vim/bundle/sparkup
--- a/bin/myctags	Tue Apr 22 18:23:20 2014 -0400
+++ b/bin/myctags	Wed May 14 12:31:30 2014 -0400
@@ -6,7 +6,7 @@
 
 mv tags tags1
 
-ffind '.js' --literal |  xargs jsctags -f tags2
+ffind '.js' --literal | xargs jsctags -f tags2 || echo > tags2
 
 
 echo '!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/' > tags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/jenkins.banksimple.com.js	Wed May 14 12:31:30 2014 -0400
@@ -0,0 +1,12 @@
+var css = '* { -webkit-transition: none !important; -moz-transition: none !important; -o-transition: none !important; -ms-transition: none !important; transition: none !important; }'
+var head = document.head || document.getElementsByTagName('head')[0]
+var style = document.createElement('style');
+ 
+style.type = 'text/css';
+if (style.styleSheet){
+style.styleSheet.cssText = css;
+} else {
+style.appendChild(document.createTextNode(css));
+}
+ 
+head.appendChild(style);
--- a/vim/vimrc	Tue Apr 22 18:23:20 2014 -0400
+++ b/vim/vimrc	Wed May 14 12:31:30 2014 -0400
@@ -1232,15 +1232,36 @@
 " }}}
 " Scala {{{
 
+function! DispatchMavenTest()
+    let view = winsaveview()
+    let zreg = @z
+
+    " Move to the top of the file
+    normal! gg
+
+    " Find the spec name
+    call search('\vclass (.*Spec)')
+    normal! w"zyiw
+
+    let spec = @z
+
+    execute "Dispatch mvn -q -B test -Dtest=" . spec
+
+    let @z = zreg
+    call winrestview(view)
+endfunction
+
 augroup ft_scala
     au!
     au Filetype scala setlocal foldmethod=marker foldmarker={,}
     au Filetype scala setlocal textwidth=100
+    au Filetype scala setlocal shiftwidth=2
     au Filetype scala compiler maven
     au Filetype scala let b:dispatch = 'mvn -B package install'
     au Filetype scala nnoremap <buffer> <localleader>s mz:%!sort-scala-imports<cr>`z
     au Filetype scala nnoremap <buffer> M :call scaladoc#Search(expand("<cword>"))<cr>
     au Filetype scala vnoremap <buffer> M "ry:call scaladoc#Search(@r)<cr>
+    au Filetype scala nnoremap <buffer> <localleader>t :call DispatchMavenTest()<cr>
     au Filetype scala nmap <buffer> <localleader>( ysiwbi
     au Filetype scala nmap <buffer> <localleader>[ ysiwri
     ")]
@@ -1410,6 +1431,7 @@
 
 let g:ctrlp_map = '<leader>,'
 nnoremap <leader>. :CtrlPTag<cr>
+nnoremap <leader>E :CtrlP ../
 
 let g:ctrlp_prompt_mappings = {
 \ 'PrtSelectMove("j")':   ['<c-j>', '<down>', '<s-tab>'],