Merge branch 'master' of github.com:bogdan/dotvim

.gitmodules

@@ -124,3 +124,6 @@
 [submodule "bundle/dispatch"]
 	path = bundle/dispatch
 	url = gh:tpope/vim-dispatch
+[submodule "bundle/file-line"]
+	path = bundle/file-line
+	url = https://github.com/bogado/file-line.git

gvimrc

@@ -7,5 +7,5 @@ if has("gui_macvim")
 else
   set guifont="Inconsolate Medium 12"
 endif
-set guioptions=aegitc
+set guioptions=egitc
 set guipty

macros/rails.vim

@@ -5,16 +5,15 @@ command! -nargs=0 RVschema :RVfind db/schema.rb
 
 
 
-Rnavcommand jade app/jades/ -suffix=.jade
-Rnavcommand service app/services/ -suffix=.rb
+"Rnavcommand service app/services/ -suffix=.rb
 Rnavcommand worker app/workers/ -suffix=.rb
-Rnavcommand factory spec/factories/ -suffix=.rb
-Rnavcommand task lib/tasks -suffix=.rake
+"Rnavcommand factory spec/factories/ -suffix=.rb
+"Rnavcommand task lib/tasks -suffix=.rake
 Rnavcommand shared spec/traits -suffix=.rb
-Rnavcommand grid app/grids -suffix=.rb
+"Rnavcommand grid app/grids -suffix=.rb
 Rnavcommand trait app/traits -suffix=.rb
-Rnavcommand yml config -suffix=.yml
+"Rnavcommand yml config -suffix=.yml
 Rnavcommand acceptance spec/acceptance -suffix=.rb
 
-let g:rake_ctags_arguments='--regex-ruby="/^[ \t]*(attr_accessor|has_many|belongs_to|has_one|scope|alias|alias_method|named_scope)[ \t(]+:([A-Za-z_]+).*$/\2/f,function/"'
+let g:rake_ctags_arguments='--regex-ruby="/^[ \t]*(trait|attr_accessor|has_many|belongs_to|has_one|scope|alias|alias_method|named_scope)[ \t(]+:([A-Za-z_]+).*$/\2/f,function/"'
 let g:rails_ctags_arguments='--exclude='.RailsRoot().'/tmp --exclude='.RailsRoot().'/public/system --exclude='.RailsRoot().'/public/uploads --languages=-javascript --langdef=coffee --langmap=coffee:.coffee --regex-coffee="/^class ([A-Za-z.]+)( extends [A-Za-z.]+)?$/\1/c,class/" --regex-coffee="/^[ \t]*@?([A-Za-z.]+):.*[-=]>.*$/\1/f,function/" --regex-coffee="/^[ \t]*([A-Za-z.]+)[ \t]+=.*[-=]>.*$/\1/f,function/" --regex-coffee="/^[ \t]*([A-Za-z.]+)[ \t]+=[^->\n]*$/\1/v,variable/" '.g:rake_ctags_arguments

snippets/all.snippets

@@ -6,6 +6,9 @@ snippet * "*"
  *  ${1}
  */
 endsnippet
+snippet cl "cl"
+console.log(${1:"${2}"});
+endsnippet
 snippet t "t"
 <${1:}/>
 endsnippet

snippets/eruby.snippets

@@ -204,3 +204,7 @@ snippet unlesse "unlesse"
 <% else %>
 <% end %>
 endsnippet
+snippet dbg "debugger"
+<% require 'debugger' -%>
+<% debugger -%>
+endsnippet

snippets/haml.snippets

@@ -1,3 +1,7 @@
+snippet dbg "dbg"
+- require 'debugger'
+- debugger
+endsnippet
 snippet conf "conf"
 - content_for :${1:yield_label_in_layout} do
   ${2}
@@ -86,7 +90,7 @@ endsnippet
 snippet jsit "jsit"
 = javascript_include_tag "${1}"
 endsnippet
-snippet k "k"
+snippet k "k" w
 :${1} => ${2}
 endsnippet
 snippet lt "lt"
@@ -113,5 +117,7 @@ endsnippet
 snippet unl "unl"
 - unless ${1}
   ${2}
-
+endsnippet
+snippet img "img"
+%img{src: "${1}"}
 endsnippet

snippets/html.snippets

@@ -70,3 +70,11 @@ endsnippet
 snippet textarea "textarea"
 <textarea name="${1:Name}" rows="${2:8}" cols="${2:40}">${3}</textarea>
 endsnippet
+
+snippet slide "slide"
+<section data-markdown>
+	<script type="text/template">
+		$0
+	</script>
+</section>
+endsnippet

snippets/javascript.snippets

@@ -116,13 +116,10 @@ snippet attrm "attrm"
 ${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})${6}
 endsnippet
 snippet bef "bef"
-before_each(function(){
+beforeEach(function(){
 	${1}	
 });${2}
 endsnippet
-snippet before "before"
-${1:obj}.before('${2:Some text <b>and bold!</b>}')${3}
-endsnippet
 snippet bind "bind"
 ${1:obj}.bind('${2:event name}', function(${3:event}) {
 	${4:// Act on the event}
@@ -141,9 +138,7 @@ endsnippet
 snippet children "children"
 ${1:obj}.children('${2:selector expression}')${3}
 endsnippet
-snippet cl "cl"
-console.log(${1});
-endsnippet
+
 snippet click "click"
 click(function(event) {
 	${1:event.preventDefault();}
@@ -195,7 +190,7 @@ ${1:obj}.error(function() {
 	${2:// Act on the event}
 });
 endsnippet
-snippet f "f"
+snippet f "f" w
 function(${1}) {
 	${2}
 }
@@ -241,8 +236,8 @@ focus(function() {
 });
 endsnippet
 snippet for "for"
-for (var <+i+>=0; <+i+> < <+<+Things+>.length+>; <+i+>++) {
-<+<+Things+>[<+i+>]+>
+for (var ${1}=0; $1 < ${2}.length; $1++) {
+	${3}
 };
 endsnippet
 snippet get "get"

snippets/liquid.snippets

@@ -23,3 +23,40 @@ tags:
 - ${3:two}
 ---
 endsnippet
+
+snippet ct "{% ct '' %}" w
+{% ct '${1:title}' %}
+endsnippet
+
+snippet - "{% _ %}" i
+{% ${1} %}
+endsnippet
+
+snippet = "{{  }}" i
+{{ ${1} }}
+endsnippet
+
+snippet p "p=''" w
+${1:class}="${2}"
+endsnippet
+
+snippet f "function() {}" w
+function(${1}) {
+	${2}
+}
+endsnippet
+
+snippet	if "if" w
+{% if ${1} %}
+{% endif %}
+endsnippet
+snippet	ife "if else" w
+{% if ${1} %}
+	${2}
+{% else %}
+	${3}
+{% endif %}
+endsnippet
+snippet el "else" w
+{% else %}
+endsnippet