Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:derekwyatt/vim-config

  • Loading branch information...
commit 9b979ccaa3de026f04ce6a7be5c55892b708bc04 2 parents a21ad45 + b8e0ff9
Derek Wyatt authored
5 after/ftplugin/java.vim
... ... @@ -0,0 +1,5 @@
  1 +set tabstop=4
  2 +set shiftwidth=4
  3 +set softtabstop=4
  4 +set expandtab
  5 +set autoindent
38 vimrc
@@ -354,7 +354,7 @@ if has("mac")
354 354 let g:main_font = "Anonymous\\ Pro:h16"
355 355 let g:small_font = "Anonymous\\ Pro:h2"
356 356 else
357   - let g:main_font = "DejaVu\\ Sans\\ Mono\\ 10"
  357 + let g:main_font = "DejaVu\\ Sans\\ Mono\\ 9"
358 358 let g:small_font = "DejaVu\\ Sans\\ Mono\\ 2"
359 359 endif
360 360
@@ -474,8 +474,8 @@ let g:SokobanLevelDirectory = "/home/dwyatt/.vim/bundle/vim-sokoban/VimSokoban/"
474 474 "-----------------------------------------------------------------------------
475 475 " FuzzyFinder Settings
476 476 "-----------------------------------------------------------------------------
477   -let g:fuf_file_exclude = '\v\~$|\.(o|exe|dll|bak|class|meta|lock|orig|jar|swp)$|/test/data\.|(^|[/\\])\.(hg|git|bzr)($|[/\\])'
478   -let g:fuf_splitPathMatching = 0
  477 +let g:fuf_file_exclude = '\v\~$|\.(o|exe|dll|bak|class|meta|lock|orig|jar|swp)$|/test/data\.|(^|[/\\])\.(svn|hg|git|bzr)($|[/\\])'
  478 +let g:fuf_splitPathMatching = 1
479 479 let g:fuf_maxMenuWidth = 110
480 480 let g:fuf_timeFormat = ''
481 481 nmap <silent> ,fv :FufFile ~/.vim/<cr>
@@ -483,13 +483,37 @@ nmap <silent> ,fc :FufMruCmd<cr>
483 483 nmap <silent> ,fm :FufMruFile<cr>
484 484
485 485 "-----------------------------------------------------------------------------
486   -" CommandT Settings
  486 +" FuzzyFinder Settings
487 487 "-----------------------------------------------------------------------------
  488 +function! GetParentOfSourceDirectory()
  489 + let fwd = expand('%:p:h')
  490 + let srcparent = substitute(fwd, '/[^/]*/src/.*', '', '')
  491 + return srcparent
  492 +endfunction
  493 +
488 494 set wildignore+=*.o,*.class,.git,.svn
489 495 let g:CommandTMatchWindowAtTop = 1
490   -nmap <silent> ,fb :CommandTBuffer<cr>
491   -nmap <silent> ,ff :CommandT<cr>
492   -nmap <silent> ,fp :CommandT ~/primal/platform<cr>
  496 +nmap <silent> ,fb :FufBuffer<cr>
  497 +nmap <silent> ,ff :FufFile<cr>
  498 +nmap <silent> ,fp :FufFile ~/primal/platform/trunk/**/<cr>
  499 +nmap <silent> ,fB :FufFile ~/primal/platform/branches/async-synth-engine-wip/**/<cr>
  500 +nmap <silent> ,fs :exec ":FufFile " . GetParentOfSourceDirectory() . "/**/"<cr>
  501 +
  502 +"-----------------------------------------------------------------------------
  503 +" SVN Helpers
  504 +"-----------------------------------------------------------------------------
  505 +function! VCSDiffMore(from)
  506 + let f = expand('%:p')
  507 + let revisions = split(system("svn log " . f . " | grep '^r[0-9][0-9]*'"), '\n')
  508 + let revisions = map(revisions, 'substitute(v:val, "r\\(\\d\\+\\) .*$", "\\1", "")')
  509 + exec ":VCSVimDiff " . revisions[a:from]
  510 +endfunction
  511 +nmap ,dd :call VCSDiffMore(0)<cr>
  512 +"function! ShowSVNRevisions()
  513 +" let f = expand('%:p')
  514 +" let revisions = system("svn log " . f)
  515 +" let buffer = bufnr('%')
  516 +"endfunction
493 517
494 518 "-----------------------------------------------------------------------------
495 519 " Gundo Settings
21 xpt-personal/ftplugin/java/java.xpt.vim
@@ -90,3 +90,24 @@ XPT package hint=package\ for\ this\ file
90 90
91 91 XPT p hint=System.out.println\(...\)
92 92 System.out.println(`cursor^);
  93 +
  94 +XPT void hint=void\ method
  95 +public void `methodName^(`args^) {
  96 + `cursor^
  97 +}
  98 +
  99 +XPT msgif hint=if\ (message\ instanceof\ ...)
  100 +if (message instanceof `classname^) {
  101 + `classname^ `m^ = (`classname^)message;
  102 + `cursor^
  103 +}
  104 +
  105 +XPT actor hint=Untyped\ Actor
  106 +public class `classname()^ extends UntypedActor {
  107 + public void onReceive(Object message) throws Exception {
  108 + if (message instanceof `classname^) {
  109 + `classname^ `m^ = (`classname^)message;
  110 + `cursor^
  111 + }
  112 + }
  113 +}

0 comments on commit 9b979cc

Please sign in to comment.
Something went wrong with that request. Please try again.