etc/vim/snippets/autoit.snippets etc/vim/snippets/tcl.snippets @@ -131,6 +131,13 @@ alias v=vim +# Sluething---------------------------------------------------- +findportuser() { + lsof -i :"$1" +} + + + # Other aliases ---------------------------------------------------- alias ll='ls -hl' alias la='ls -a' @@ -165,6 +172,10 @@ alias untar="tar xvzf" alias cp_folder="cp -Rpv" #copies folder and all sub files and folders, preserving security and dates +killhard() { + kill -9 "$1" +} + # Bring in the other files ---------------------------------------------------- etc/bashrc @@ -65,13 +65,20 @@ alias gtshowcommands="echo -e '${COLOR_LIGHT_PURPLE}Available commands: ${COLOR_BLUE}gt${COLOR_NC}show ${COLOR_BLUE}gt${COLOR_NC}diff ${COLOR_BLUE}gt${COLOR_NC}diff${COLOR_BLUE}staged${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}merge + ${COLOR_BLUE}gt${COLOR_NC}merge${COLOR_BLUE}head${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}merge${COLOR_BLUE}with${COLOR_NC}tool ${COLOR_BLUE}gt${COLOR_NC}push ${COLOR_BLUE}gt${COLOR_NC}pull ${COLOR_BLUE}gt${COLOR_NC}fetch - ${COLOR_BLUE}gt${COLOR_NC}checkout ${COLOR_GRAY}(like svn revert) Example: gtcheckout your_file + ${COLOR_BLUE}gt${COLOR_NC}checkout ${COLOR_GRAY}(like svn revert in some cases) Example: gtcheckout your_file or gtcheckout your_local_branch + ${COLOR_BLUE}gt${COLOR_NC}checkout${COLOR_BLUE}initial${COLOR_NC}remote{COLOR_BLUE}branch${COLOR_NC} ${COLOR_GRAY}Example: gtcheckoutinitialremotebranch your_branch ${COLOR_BLUE}gt${COLOR_NC}blame ${COLOR_BLUE}gt${COLOR_NC}log ${COLOR_BLUE}gt${COLOR_NC}log${COLOR_BLUE}stat${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}branch + ${COLOR_BLUE}gt${COLOR_NC}branch${COLOR_BLUE}delete${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}branch${COLOR_BLUE}list${COLOR_NC}all ${COLOR_BLUE}gt${COLOR_NC}status '" @@ -96,13 +103,16 @@ alias gtlogstat='gt log --stat' alias gtstatus='gt status' alias gtmerge='gt merge' alias gtmergehead='gt merge origin/master' +alias gtmergewithtool='gt mergetool' alias gttagadd='gt tag -a' alias gttaglist='gt tag -l' alias gtbranch='gt branch' alias gtbranchdelete='gt branch -d' alias gtbranchlistall='gt branch -a' - +gtcheckoutinitialremotebranch (){ + git checkout -tlb $1 origin/$1 +} # Rails and Rake ------------------------------------------------- alias rrshowcommands="echo -e '${COLOR_LIGHT_PURPLE}Available commands: etc/bashrc_app_specific @@ -81,7 +81,7 @@ fun s:ProcessSnippet(snip) while stridx(snippet, '${'.i) != -1 let s = matchstr(snippet, '${'.i.':\zs.\{-}\ze}') if s != '' - let snippet = substitute(snippet, '$'.i, '&'.s, 'g') + let snippet = substitute(snippet, '$'.i, s.'&', 'g') endif let i += 1 endw @@ -120,27 +120,27 @@ fun s:BuildTabStops(snip, lnum, col, indent) let withoutVars = substitute(a:snip, '$\d\+', '', 'g') while stridx(a:snip, '${'.i) != -1 let beforeTabStop = matchstr(withoutVars, '^.*\ze${'.i.'\D') - let withoutOthers = substitute(withoutVars, '${'.i.'\@!\d\+.\{-}}', '', 'g') - let snipPos += [[a:lnum + s:Count(beforeTabStop, "\n"), - \ a:indent + len(matchstr(withoutOthers, - \ "^.*\\(\n\\|^\\)\\zs.*\\ze${".i.'\D')), -1]] - if snipPos[i-1][0] == a:lnum - let snipPos[i-1][1] += a:col - endif + let withoutOthers = substitute(withoutVars, '${\('.i.'\D\)\@!\d\+.\{-}}', '', 'g') + + let j = i - 1 + call add(snipPos, [0, 0, -1]) + let snipPos[j][0] = a:lnum + s:Count(beforeTabStop, "\n") + let snipPos[j][1] = a:indent + len(matchstr(withoutOthers, '.*\(\n\|^\)\zs.*\ze${'.i.'\D')) + if snipPos[j][0] == a:lnum | let snipPos[j][1] += a:col | endif " Get all $# matches in another list, if ${#:name} is given if stridx(withoutVars, '${'.i.':') != -1 - let j = i - 1 let snipPos[j][2] = len(matchstr(withoutVars, '${'.i.':\zs.\{-}\ze}')) - let snipPos[j] += [[]] + let dots = repeat('.', snipPos[j][2]) + call add(snipPos[j], []) let withoutOthers = substitute(a:snip, '${\d\+.\{-}}\|$'.i.'\@!\d\+', '', 'g') while match(withoutOthers, '$'.i.'\D') != -1 - let beforeMark = matchstr(withoutOthers, '^.\{-}\ze$'.i.'\D') - let linecount = a:lnum + s:Count(beforeMark, "\n") - let snipPos[j][3] += [[linecount, - \ a:indent + (linecount > a:lnum - \ ? len(matchstr(beforeMark, "^.*\n\\zs.*")) - \ : a:col + len(beforeMark))]] + let beforeMark = matchstr(withoutOthers, '^.\{-}\ze'.dots.'$'.i.'\D') + call add(snipPos[j][3], [0, 0]) + let snipPos[j][3][-1][0] = a:lnum + s:Count(beforeMark, "\n") + let snipPos[j][3][-1][1] = a:indent + (snipPos[j][3][-1][0] > a:lnum + \ ? len(matchstr(beforeMark, '.*\n\zs.*')) + \ : a:col + len(beforeMark)) let withoutOthers = substitute(withoutOthers, '$'.i.'\ze\D', '', '') endw endif etc/vim/autoload/snipMate.vim @@ -62,7 +62,7 @@ only be used outside of a snippet declaration. E.g.: > snippet trigger expanded text snippet another_trigger - # this isn't a comment! + # this doesn't work! expanded text < This should hopefully be obvious with the included syntax highlighting. etc/vim/doc/snipMate.txt @@ -1,7 +1,6 @@ " File: snipMate.vim " Author: Michael Sanders -" Version: 0.81 -" Last Modified: May 15, 2009 +" Version: 0.82 " Description: snipMate.vim implements some of TextMate's snippets features in " Vim. A snippet is a piece of often-typed text that you can " insert into your document using a trigger word followed by a "<tab>". @@ -192,17 +191,19 @@ fun s:ChooseSnippet(scope, trigger) return num == -1 ? '' : s:multi_snips[a:scope][a:trigger][num][1] endf -fun ShowAvailableSnips() - let word = matchstr(getline('.'), '\S\+\%'.col('.').'c') +fun! ShowAvailableSnips() + let line = getline('.') + let col = col('.') + let word = matchstr(getline('.'), '\S\+\%'.col.'c') let words = [word] if stridx(word, '.') let words += split(word, '\.', 1) endif - let matchpos = 0 + let matchlen = 0 let matches = [] for scope in [bufnr('%')] + split(&ft, '\.') + ['_'] - let triggers = exists('s:snippets["'.scope.'"]') ? keys(s:snippets[scope]) : [] - if exists('s:multi_snips["'.scope.'"]') + let triggers = has_key(s:snippets, scope) ? keys(s:snippets[scope]) : [] + if has_key(s:multi_snips, scope) let triggers += keys(s:multi_snips[scope]) endif for trigger in triggers @@ -212,12 +213,16 @@ fun ShowAvailableSnips() elseif trigger =~ '^'.word let matches += [trigger] let len = len(word) - if len > matchpos | let matchpos = len | endif + if len > matchlen | let matchlen = len | endif endif endfor endfor endfor - call complete(col('.') - matchpos, matches) + + " This is to avoid a bug with Vim when using complete(col - matchlen, matches) + " (Issue#46 on the Google Code snipMate issue tracker). + call setline(line('.'), substitute(line, repeat('.', matchlen).'\%'.col.'c', '', '')) + call complete(col, matches) return '' endf " vim:noet:sw=4:ts=4:ft=vim etc/vim/plugin/snipMate.vim @@ -3,9 +3,7 @@ # (c) holds no legal value ;) snippet c) `&enc[:2] == "utf" ? "©" : "(c)"` Copyright `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.${2} - snippet date `strftime("%Y-%m-%d")` - snippet lorem Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. etc/vim/snippets/_.snippets @@ -23,11 +23,11 @@ snippet def # cleaner, I don't know how to do it in vim script) snippet once #ifndef ${1:`toupper(Filename('', 'UNTITLED').'_'.system("/usr/bin/ruby -e 'print (rand * 2821109907455).round.to_s(36)'"))`} - + #define $1 - + ${2} - + #endif /* end of include guard: $1 */ # If Condition snippet if etc/vim/snippets/c.snippets @@ -24,7 +24,7 @@ snippet cl public: $1 (${2:arguments}); virtual ~$1 (); - + private: ${3:/* data */} }; etc/vim/snippets/cpp.snippets @@ -10,37 +10,27 @@ snippet rce snippet end <% end -%>${1} snippet for - <% unless ${1:list}.blank? %> - <% for ${2:item} in $1 %> - ${3} - <% end %> - <% end %> -snippet forelse - <% unless ${1:list}.blank? %> - <% for ${2:item} in $1 %> - ${3} - <% end %> - <% else %> - ${4} + <% for ${2:item} in $1 %> + ${3} <% end %> snippet rp - render :partial => "${1:item}" + <%= render :partial => '${1:item}' %> snippet rpl - render :partial => "${1:item}", :locals => { :${2:name} => "${3:value}"$4 } + <%= render :partial => '${1:item}', :locals => { :${2:name} => '${3:value}'$4 } %> snippet rps - render :partial => "${1:item}", :status => ${2:500} + <%= render :partial => '${1:item}', :status => ${2:500} %> snippet rpc - render :partial => "${1:item}", :collection => ${2:items} + <%= render :partial => '${1:item}', :collection => ${2:items} %> snippet lia - <%= link_to "${1:link text...}", :action => "${2:index}" %> + <%= link_to '${1:link text...}', :action => '${2:index}' %> snippet liai - <%= link_to "${1:link text...}", :action => "${2:edit}", :id => ${3:@item} %> + <%= link_to '${1:link text...}', :action => '${2:edit}', :id => ${3:@item} %> snippet lic - <%= link_to "${1:link text...}", :controller => "${2:items}" %> + <%= link_to '${1:link text...}', :controller => '${2:items}' %> snippet lica - <%= link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:index}" %> + <%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:index}' %> snippet licai - <%= link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:edit}", :id => ${4:@item} %> + <%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:edit}', :id => ${4:@item} %> snippet yield <%= yield${1::content_symbol}%>${2} snippet conf etc/vim/snippets/eruby.snippets @@ -4,21 +4,21 @@ snippet main ${1:/* code */} } snippet pu - public + public snippet po - protected + protected snippet pr - private + private snippet st - static + static snippet fi - final + final snippet ab - abstract + abstract snippet re - return + return snippet br - break; + break; snippet de default: ${1} etc/vim/snippets/java.snippets @@ -22,7 +22,7 @@ snippet objc { } @end - + @implementation $1 ${3} @end @@ -52,7 +52,7 @@ snippet ibo snippet cat @interface ${1:NSObject} (${2:Category}) @end - + @implementation $1 ($2) ${3} @end @@ -122,7 +122,7 @@ snippet objacc { return $2; } - + - (void)set$2:($1)${3:new$2} { [$3 retain]; @@ -136,7 +136,7 @@ snippet fora } snippet forarray unsigned int ${1:object}Count = [${2:array} count]; - + for (unsigned int index = 0; index < $1Count; index++) { ${3:id} $1 = [$2 $1AtIndex:index]; ${4} @@ -157,7 +157,7 @@ snippet ret # release snippet rel [${1:foo} release]; - ${2:$1 = nil;} + ${2:$1 = nil;} # autorelease snippet arel [${1:foo} autorelease]; etc/vim/snippets/objc.snippets @@ -3,7 +3,7 @@ snippet php ${1} ?> snippet ec - echo "${1:string}";${2} + echo "${1:string}"${2}; snippet inc include '${1:file}';${2} snippet inc1 @@ -119,7 +119,7 @@ snippet doc_h * @copyright ${4:$2}, `strftime('%d %B, %Y')` * @package ${5:default} **/ - + /** * Define DocBlock *// etc/vim/snippets/php.snippets @@ -1,6 +1,8 @@ snippet #! #!/usr/bin/python +snippet imp + import ${1:module} # Module Docstring snippet docs ''' @@ -27,9 +29,12 @@ snippet def def ${1:fname}(${2:`indent('.') ? 'self' : ''`}): """${3:docstring for $1}""" ${4:pass} +snippet deff + def ${1:fname}(${2:`indent('.') ? 'self' : ''`}): + ${3} # New Method snippet defs - def ${1:mname}(self, ${2:arg})): + def ${1:mname}(self, ${2:arg}): ${3:pass} # New Property snippet property @@ -39,7 +44,9 @@ snippet property ${3:return self._$1} def fset(self, value): ${4:self._$1 = value} - +# Lambda +snippet ld + ${1:var} = lambda ${2:vars} : ${3:action} snippet . self. snippet try Try/Except etc/vim/snippets/python.snippets @@ -420,6 +420,6 @@ snippet tas snippet pt puts ${1} snippet ps - puts '${1}' + puts '${1}'${2} snippet pd - puts "${1}" + puts "${1}"${2} etc/vim/snippets/ruby.snippets @@ -1,7 +1,7 @@ # #!/bin/bash snippet #! #!/bin/bash - + snippet if if [[ ${1:condition} ]]; then ${2:#statements} etc/vim/snippets/sh.snippets @@ -3,8 +3,6 @@ snippet header " Author: ${2:`g:snips_author`} " Description: ${3} ${4:" Last Modified: `strftime("%B %d, %Y")`} -snippet lm - " Last Modified: `strftime("%B %d, %Y")` snippet guard if exists('${1:did_`Filename()`}') || &cp${2: || version < 700} finish etc/vim/snippets/vim.snippets 849c20d72b99258d38a97d872f01989f6b9eefb4 Todd Werth twerth@infinitered.com http://github.com/twerth/dotfiles/commit/50790b6b1f9b643d0cd0ebb953a9cfba64c3d0c1 50790b6b1f9b643d0cd0ebb953a9cfba64c3d0c1 2009-06-24T08:41:01-07:00 2009-06-24T08:41:01-07:00 Added a few things to bashrc. Added new git commands. Updated snipMate code from author. Mod'd snippets 19c4dc6e3eae62e3272089924338855557bb2a14 Todd Werth twerth@infinitered.com