Merge remote-tracking branch 'upstream/master'

UltiSnips/c.snippets

@@ -16,7 +16,7 @@ endsnippet
 
 snippet #if "#if #endif" b
 #if ${1:0}
-${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
+${VISUAL}${0}
 #endif
 endsnippet
 
@@ -40,7 +40,7 @@ endsnippet
 snippet main "main() (main)"
 int main(int argc, char *argv[])
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 	return 0;
 }
 endsnippet
@@ -48,14 +48,14 @@ endsnippet
 snippet for "for loop (for)"
 for (${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet fori "for int loop (fori)"
 for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
@@ -86,13 +86,13 @@ endsnippet
 
 snippet wh "while loop"
 while(${1:/* condition */}) {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet do "do...while loop (do)"
 do {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 } while(${1:/* condition */});
 endsnippet
 
@@ -103,26 +103,26 @@ endsnippet
 snippet if "if .. (if)"
 if (${1:/* condition */})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet el "else .. (else)"
 else {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet eli "else if .. (eli)"
 else if (${1:/* condition */}) {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet ife "if .. else (ife)"
 if (${1:/* condition */})
 {
-	${2:/* code */}
+	${2}
 }
 else
 {
@@ -144,7 +144,7 @@ endsnippet
 snippet fun "function" b
 ${1:void} ${2:function_name}(${3})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 

UltiSnips/cpp.snippets

@@ -27,7 +27,7 @@ endsnippet
 snippet ns "namespace .. (namespace)"
 namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
 endsnippet
 

UltiSnips/d.snippets

@@ -106,14 +106,14 @@ endsnippet
 snippet if "if .. (if)"
 if(${1:/*condition*/})
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet ife "if .. else (ife)" b
 if(${1:/*condition*/})
 {
-	${2:/*code*/}
+	${2}
 }
 else
 {
@@ -124,14 +124,14 @@ endsnippet
 snippet el "else (el)" b
 else
 {
-	${VISUAL}${1:/*code*/}
+	${VISUAL}${1}
 }
 endsnippet
 
 snippet elif "else if (elif)" b
 else if(${1:/*condition*/})
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
@@ -139,10 +139,10 @@ snippet sw "switch (sw)"
 switch(${1:/*var*/})
 {
 	case ${2:/*value*/}:
-		${3:/*code*/}
+		${3}
 		break;
 	case ${4:/*value*/}:
-		${5:/*code*/}
+		${5}
 		break;
 	${7:/*more cases*/}
 	default:
@@ -154,10 +154,10 @@ snippet fsw "final switch (fsw)"
 switch(${1:/*var*/})
 {
 	case ${2:/*value*/}:
-		${3:/*code*/}
+		${3}
 		break;
 	case ${4:/*value*/}:
-		${5:/*code*/}
+		${5}
 		break;
 	${7:/*more cases*/}
 }
@@ -165,7 +165,7 @@ endsnippet
 
 snippet case "case (case)" b
 case ${1:/*value*/}:
-	${2:/*code*/}
+	${2}
 	break;
 endsnippet
 
@@ -178,42 +178,42 @@ endsnippet
 snippet do "do while (do)" b
 do
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 } while(${1:/*condition*/});
 endsnippet
 
 snippet wh "while (wh)" b
 while(${1:/*condition*/})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
 snippet for "for (for)" b
 for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet forever "forever (forever)" b
 for(;;)
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet fore "foreach (fore)"
 foreach(${1:/*elem*/}; ${2:/*range*/})
 {
-	${VISUAL}${3:/*code*/}
+	${VISUAL}${3}
 }
 endsnippet
 
 snippet forif "foreach if (forif)" b
 foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
 {
-	${VISUAL}${4:/*code*/}
+	${VISUAL}${4}
 }
 endsnippet
 
@@ -249,21 +249,21 @@ endsnippet
 snippet fun "function definition (fun)"
 ${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
 {
-	${VISUAL}${5:/*code*/}
+	${VISUAL}${5}
 }
 endsnippet
 
 snippet void "void function definition (void)"
 void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
 {
-	${VISUAL}${4:/*code*/}
+	${VISUAL}${4}
 }
 endsnippet
 
 snippet this "ctor (this)" w
 this(${1:/*args*/})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
@@ -295,7 +295,7 @@ endsnippet
 snippet scope "scope (scope)" b
 scope(${1:exit})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
@@ -304,7 +304,7 @@ endsnippet
 snippet with "with (with)"
 with(${1})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
@@ -405,14 +405,14 @@ endsnippet
 snippet version "version (version)" b
 version(${1:/*version name*/})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
 snippet debug "debug" b
 debug
 {
-	${VISUAL}${1:/*code*/}
+	${VISUAL}${1}
 }
 endsnippet
 
@@ -422,7 +422,7 @@ endsnippet
 snippet temp "template (temp)" b
 template ${2:/*name*/}(${1:/*args*/})
 {
-	${3:/*code*/}
+	${3}
 }
 endsnippet
 
@@ -440,7 +440,7 @@ endsnippet
 snippet unittest "unittest (unittest)" b
 unittest
 {
-	${1:/*code*/}
+	${1}
 }
 endsnippet
 
@@ -450,21 +450,21 @@ endsnippet
 snippet opDis "opDispatch (opDis)" b
 ${1:/*return type*/} opDispatch(string s)()
 {
-	${2:/*code*/};
+	${2};
 }
 endsnippet
 
 snippet op= "opAssign (op=)" b
 void opAssign(${1} rhs) ${2:@safe pure nothrow}
 {
-	${2:/*code*/}
+	${2}
 }
 endsnippet
 
 snippet opCmp "opCmp (opCmp)" b
 int opCmp(${1} rhs) @safe const pure nothrow
 {
-	${2:/*code*/}
+	${2}
 }
 endsnippet
 
@@ -484,7 +484,7 @@ endsnippet
 snippet toString "toString (toString)" b
 string toString() @safe const pure nothrow
 {
-	${1:/*code*/}
+	${1}
 }
 endsnippet
 

UltiSnips/javascript_angular.snippets

@@ -0,0 +1,25 @@
+priority -50
+
+snippet iti "it (js, inject)" b
+it('${1:description}', inject(function($2) {
+	$0
+}));
+endsnippet
+
+snippet befi "before each (js, inject)" b
+beforeEach(inject(function($1) {
+	$0
+}));
+endsnippet
+
+snippet aconf "angular config" i
+config(function($1) {
+	$0
+});
+endsnippet
+
+snippet acont "angular controller" i
+controller('${1:name}', function($2) {
+	$0
+});
+endsnippet

UltiSnips/markdown.snippets

@@ -39,4 +39,15 @@ snippet img "Image"
 ![${1:pic alt}](${2:path}${3/.+/ "/}${3:opt title}${3/.+/"/})$0
 endsnippet
 
+snippet ilc "Inline Code" i
+\`$1\`$0
+endsnippet
+
+snippet cbl "Codeblock" b
+\`\`\`
+$1
+\`\`\`
+$0
+endsnippet
+
 # vim:ft=snippets:

UltiSnips/pandoc.snippets

@@ -0,0 +1,3 @@
+priority -49
+
+extends markdown

UltiSnips/r.snippets

@@ -48,7 +48,7 @@ while(${1}) {
 endsnippet
 
 snippet for "for loop"
-for ({${1:item} in ${2:list}) {
+for (${1:item} in ${2:list}) {
 	${3}
 }
 endsnippet

UltiSnips/rust.snippets

@@ -2,29 +2,31 @@
 #                            Rust Snippets                            #
 #######################################################################
 
+priority -50
+
 ###############
 #  Functions  #
 ###############
-snippet fn "A function, optionally with arguments and return type."
+snippet fn "A function, optionally with arguments and return type." b
 fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
-snippet test "Test function"
+snippet test "Test function" b
 #[test]
 fn ${1:test_function_name}() {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
-snippet new "A new function"
+snippet new "A new function" b
 pub fn new(${2}) -> ${1:Name} {
 	${VISUAL}${0}return $1 { ${3} };
 }
 endsnippet
 
-snippet main "The main function"
+snippet main "The main function" b
 pub fn main() {
 	${VISUAL}${0}
 }
@@ -32,7 +34,7 @@ endsnippet
 
 
 
-snippet let "A let statement"
+snippet let "A let statement" b
 let ${1:name}${3} = ${VISUAL}${2};
 endsnippet
 
@@ -53,7 +55,7 @@ endsnippet
 
 snippet mod	 "A mod." b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 } /* $1 */
 endsnippet
 
@@ -95,7 +97,7 @@ endsnippet
 
 snippet if "if .. (if)" b
 if ${1:/* condition */} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
@@ -107,19 +109,19 @@ endsnippet
 
 snippet while "while .. {}" b
 while ${1:condition} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet for "for .. in .." b
 for ${1:i} in ${2:range(0u, 10)} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet spawn "spawn(proc() { .. });" b
 spawn(proc() {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 });
 endsnippet
 
@@ -144,13 +146,13 @@ endsnippet
 ############
 snippet st "Struct" b
 struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet stn "Struct with new constructor." b
 pub struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
-	${3:/* code */}
+	${3}
 }
 
 impl $1 {
@@ -178,14 +180,14 @@ endsnippet
 ##########
 snippet imp "An impl" b
 impl ${1:Name} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet drop "Drop implementation" b
 impl Drop for ${1:Name} {
 	fn drop(&mut self) {
-		${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+		${VISUAL}${0}
 	}
 }
 endsnippet
@@ -196,7 +198,7 @@ endsnippet
 ############
 snippet trait "Trait block" b
 trait ${1:Name} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 

UltiSnips/soy.snippets

@@ -0,0 +1,63 @@
+priority -50
+
+extends html
+
+snippet ns "Namespace" b
+{namespace ${1:name}}
+endsnippet
+
+snippet tmpl "Template" b
+/**
+ * ${2:TODO(`whoami`): Describe this template.}
+ */
+{template .${1:name}}
+	$0
+{/template}
+endsnippet
+
+snippet msg "Message" b
+{msg desc="${1:description}"}
+	$0
+{/msg}
+endsnippet
+
+snippet let "let command" b
+{let $${1:identifier}: ${2:expression} /}
+endsnippet
+
+snippet if "if .. (if)" b
+{if ${1:expression}}
+	$0
+{/if}
+endsnippet
+
+snippet ife "if .. else (ife)" b
+{if ${1:expression}}
+	$2
+{else}
+	$0
+{/if}
+endsnippet
+
+snippet eli "else if .. (eli)" b
+{elif ${1:expression}}
+	$0
+endsnippet
+
+snippet fore "foreach command" b
+{foreach $${1:var} in ${2:ref}}
+	$0
+{/foreach}
+endsnippet
+
+snippet for "for command" b
+{for $${1:var} in range(${2:rangeexpr})}
+	$0
+{/for}
+endsnippet
+
+snippet call "template call" b
+{call ${1:tmpl}}
+	$0
+{/call}
+endsnippet

snippets/r.snippets

@@ -23,6 +23,16 @@ snippet ei
 		${0}
 	}
 
+# loops
+snippet wh
+while(${1}) {
+	${2}
+}
+snippet for
+for (${1:item} in ${2:list}) {
+	${3}
+}
+
 # functions
 snippet fun
 	${1:name} <- function (${2:variables}) {

snippets/ruby.snippets

@@ -1030,9 +1030,9 @@ snippet aft
 		${0}
 	end
 snippet let
-	let(:${1:object}) ${0}
+	let(:${1:object}) { ${0} }
 snippet let!
-	let!(:${1:object}) ${0}
+	let!(:${1:object}) { ${0} }
 snippet subj
 	subject { ${0} }
 snippet s.