Merge remote-tracking branch 'upstream/master'

darookee · Apr 30, 2014 · ebbd6a8 · ebbd6a8
2 parents aefcab6 + fa8778d
commit ebbd6a8
Show file tree

Hide file tree

Showing 11 changed files with 174 additions and 60 deletions.
diff --git a/UltiSnips/c.snippets b/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,22 +40,22 @@ endsnippet
 snippet main "main() (main)"
 int main(int argc, char *argv[])
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 	return 0;
 }
 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
 

diff --git a/UltiSnips/cpp.snippets b/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
 

diff --git a/UltiSnips/d.snippets b/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,25 +124,25 @@ 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
 
 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,18 +154,18 @@ 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*/}
 }
 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
 

diff --git a/UltiSnips/javascript_angular.snippets b/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
diff --git a/UltiSnips/markdown.snippets b/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:
diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
@@ -0,0 +1,3 @@
+priority -49
+
+extends markdown
diff --git a/UltiSnips/r.snippets b/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