Remove /* code */ placeholders from c, cpp and d.

dcbishop · dcbishop · commit 7b5d7de5e9d7 · 2014-04-18T18:10:50.000+10:00
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
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ endsnippet`
`16`	`16`
`17`	`17`	`snippet #if "#if #endif" b`
`18`	`18`	`#if ${1:0}`
`19`		`-${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}`
	`19`	`+${VISUAL}${0}`
`20`	`20`	`#endif`
`21`	`21`	`endsnippet`
`22`	`22`
`@@ -40,22 +40,22 @@ endsnippet`
`40`	`40`	`snippet main "main() (main)"`
`41`	`41`	`int main(int argc, char *argv[])`
`42`	`42`	`{`
`43`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`43`	`+ ${VISUAL}${0}`
`44`	`44`	`return 0;`
`45`	`45`	`}`
`46`	`46`	`endsnippet`
`47`	`47`
`48`	`48`	`snippet for "for loop (for)"`
`49`	`49`	`for (${2:i} = 0; $2 < ${1:count}; ${3:++$2})`
`50`	`50`	`{`
`51`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`51`	`+ ${VISUAL}${0}`
`52`	`52`	`}`
`53`	`53`	`endsnippet`
`54`	`54`
`55`	`55`	`snippet fori "for int loop (fori)"`
`56`	`56`	`for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})`
`57`	`57`	`{`
`58`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`58`	`+ ${VISUAL}${0}`
`59`	`59`	`}`
`60`	`60`	`endsnippet`
`61`	`61`
`@@ -86,13 +86,13 @@ endsnippet`
`86`	`86`
`87`	`87`	`snippet wh "while loop"`
`88`	`88`	`while(${1:/* condition */}) {`
`89`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`89`	`+ ${VISUAL}${0}`
`90`	`90`	`}`
`91`	`91`	`endsnippet`
`92`	`92`
`93`	`93`	`snippet do "do...while loop (do)"`
`94`	`94`	`do {`
`95`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`95`	`+ ${VISUAL}${0}`
`96`	`96`	`} while(${1:/* condition */});`
`97`	`97`	`endsnippet`
`98`	`98`
`@@ -103,26 +103,26 @@ endsnippet`
`103`	`103`	`snippet if "if .. (if)"`
`104`	`104`	`if (${1:/* condition */})`
`105`	`105`	`{`
`106`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`106`	`+ ${VISUAL}${0}`
`107`	`107`	`}`
`108`	`108`	`endsnippet`
`109`	`109`
`110`	`110`	`snippet el "else .. (else)"`
`111`	`111`	`else {`
`112`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`112`	`+ ${VISUAL}${0}`
`113`	`113`	`}`
`114`	`114`	`endsnippet`
`115`	`115`
`116`	`116`	`snippet eli "else if .. (eli)"`
`117`	`117`	`else if (${1:/* condition */}) {`
`118`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`118`	`+ ${VISUAL}${0}`
`119`	`119`	`}`
`120`	`120`	`endsnippet`
`121`	`121`
`122`	`122`	`snippet ife "if .. else (ife)"`
`123`	`123`	`if (${1:/* condition */})`
`124`	`124`	`{`
`125`		`- ${2:/* code */}`
	`125`	`+ ${2}`
`126`	`126`	`}`
`127`	`127`	`else`
`128`	`128`	`{`
`@@ -144,7 +144,7 @@ endsnippet`
`144`	`144`	`snippet fun "function" b`
`145`	`145`	`${1:void} ${2:function_name}(${3})`
`146`	`146`	`{`
`147`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`147`	`+ ${VISUAL}${0}`
`148`	`148`	`}`
`149`	`149`	`endsnippet`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ endsnippet`
`27`	`27`	`snippet ns "namespace .. (namespace)"`
`28`	`28`	namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
`29`	`29`	`{`
`30`		`- ${VISUAL}${0:${VISUAL/(.)/(?1::\/ code *\/)/}}`
	`30`	`+ ${VISUAL}${0}`
`31`	`31`	`}${1/.+/ \/* /m}$1${1/.+/ *\/ /m}`
`32`	`32`	`endsnippet`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -106,14 +106,14 @@ endsnippet`
`106`	`106`	`snippet if "if .. (if)"`
`107`	`107`	`if(${1:/condition/})`
`108`	`108`	`{`
`109`		`- ${VISUAL}${0:/code/}`
	`109`	`+ ${VISUAL}${0}`
`110`	`110`	`}`
`111`	`111`	`endsnippet`
`112`	`112`
`113`	`113`	`snippet ife "if .. else (ife)" b`
`114`	`114`	`if(${1:/condition/})`
`115`	`115`	`{`
`116`		`- ${2:/code/}`
	`116`	`+ ${2}`
`117`	`117`	`}`
`118`	`118`	`else`
`119`	`119`	`{`
`@@ -124,25 +124,25 @@ endsnippet`
`124`	`124`	`snippet el "else (el)" b`
`125`	`125`	`else`
`126`	`126`	`{`
`127`		`- ${VISUAL}${1:/code/}`
	`127`	`+ ${VISUAL}${1}`
`128`	`128`	`}`
`129`	`129`	`endsnippet`
`130`	`130`
`131`	`131`	`snippet elif "else if (elif)" b`
`132`	`132`	`else if(${1:/condition/})`
`133`	`133`	`{`
`134`		`- ${VISUAL}${0:/code/}`
	`134`	`+ ${VISUAL}${0}`
`135`	`135`	`}`
`136`	`136`	`endsnippet`
`137`	`137`
`138`	`138`	`snippet sw "switch (sw)"`
`139`	`139`	`switch(${1:/var/})`
`140`	`140`	`{`
`141`	`141`	`case ${2:/value/}:`
`142`		`- ${3:/code/}`
	`142`	`+ ${3}`
`143`	`143`	`break;`
`144`	`144`	`case ${4:/value/}:`
`145`		`- ${5:/code/}`
	`145`	`+ ${5}`
`146`	`146`	`break;`
`147`	`147`	`${7:/more cases/}`
`148`	`148`	`default:`
`@@ -154,18 +154,18 @@ snippet fsw "final switch (fsw)"`
`154`	`154`	`switch(${1:/var/})`
`155`	`155`	`{`
`156`	`156`	`case ${2:/value/}:`
`157`		`- ${3:/code/}`
	`157`	`+ ${3}`
`158`	`158`	`break;`
`159`	`159`	`case ${4:/value/}:`
`160`		`- ${5:/code/}`
	`160`	`+ ${5}`
`161`	`161`	`break;`
`162`	`162`	`${7:/more cases/}`
`163`	`163`	`}`
`164`	`164`	`endsnippet`
`165`	`165`
`166`	`166`	`snippet case "case (case)" b`
`167`	`167`	`case ${1:/value/}:`
`168`		`- ${2:/code/}`
	`168`	`+ ${2}`
`169`	`169`	`break;`
`170`	`170`	`endsnippet`
`171`	`171`
`@@ -178,42 +178,42 @@ endsnippet`
`178`	`178`	`snippet do "do while (do)" b`
`179`	`179`	`do`
`180`	`180`	`{`
`181`		`- ${VISUAL}${2:/code/}`
	`181`	`+ ${VISUAL}${2}`
`182`	`182`	`} while(${1:/condition/});`
`183`	`183`	`endsnippet`
`184`	`184`
`185`	`185`	`snippet wh "while (wh)" b`
`186`	`186`	`while(${1:/condition/})`
`187`	`187`	`{`
`188`		`- ${VISUAL}${2:/code/}`
	`188`	`+ ${VISUAL}${2}`
`189`	`189`	`}`
`190`	`190`	`endsnippet`
`191`	`191`
`192`	`192`	`snippet for "for (for)" b`
`193`	`193`	`for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})`
`194`	`194`	`{`
`195`		`- ${VISUAL}${0:/code/}`
	`195`	`+ ${VISUAL}${0}`
`196`	`196`	`}`
`197`	`197`	`endsnippet`
`198`	`198`
`199`	`199`	`snippet forever "forever (forever)" b`
`200`	`200`	`for(;;)`
`201`	`201`	`{`
`202`		`- ${VISUAL}${0:/code/}`
	`202`	`+ ${VISUAL}${0}`
`203`	`203`	`}`
`204`	`204`	`endsnippet`
`205`	`205`
`206`	`206`	`snippet fore "foreach (fore)"`
`207`	`207`	`foreach(${1:/elem/}; ${2:/range/})`
`208`	`208`	`{`
`209`		`- ${VISUAL}${3:/code/}`
	`209`	`+ ${VISUAL}${3}`
`210`	`210`	`}`
`211`	`211`	`endsnippet`
`212`	`212`
`213`	`213`	`snippet forif "foreach if (forif)" b`
`214`	`214`	`foreach(${1:/elem/}; ${2:/range/}) if(${3:/condition/})`
`215`	`215`	`{`
`216`		`- ${VISUAL}${4:/code/}`
	`216`	`+ ${VISUAL}${4}`
`217`	`217`	`}`
`218`	`218`	`endsnippet`
`219`	`219`
`@@ -249,21 +249,21 @@ endsnippet`
`249`	`249`	`snippet fun "function definition (fun)"`
`250`	`250`	`${1:void} ${2:/function name/}(${3:/args/}) ${4:@safe pure nothrow}`
`251`	`251`	`{`
`252`		`- ${VISUAL}${5:/code/}`
	`252`	`+ ${VISUAL}${5}`
`253`	`253`	`}`
`254`	`254`	`endsnippet`
`255`	`255`
`256`	`256`	`snippet void "void function definition (void)"`
`257`	`257`	`void ${1:/function name/}(${2:/args/}) ${3:@safe pure nothrow}`
`258`	`258`	`{`
`259`		`- ${VISUAL}${4:/code/}`
	`259`	`+ ${VISUAL}${4}`
`260`	`260`	`}`
`261`	`261`	`endsnippet`
`262`	`262`
`263`	`263`	`snippet this "ctor (this)" w`
`264`	`264`	`this(${1:/args/})`
`265`	`265`	`{`
`266`		`- ${VISUAL}${2:/code/}`
	`266`	`+ ${VISUAL}${2}`
`267`	`267`	`}`
`268`	`268`	`endsnippet`
`269`	`269`
`@@ -295,7 +295,7 @@ endsnippet`
`295`	`295`	`snippet scope "scope (scope)" b`
`296`	`296`	`scope(${1:exit})`
`297`	`297`	`{`
`298`		`- ${VISUAL}${2:/code/}`
	`298`	`+ ${VISUAL}${2}`
`299`	`299`	`}`
`300`	`300`	`endsnippet`
`301`	`301`
`@@ -304,7 +304,7 @@ endsnippet`
`304`	`304`	`snippet with "with (with)"`
`305`	`305`	`with(${1})`
`306`	`306`	`{`
`307`		`- ${VISUAL}${2:/code/}`
	`307`	`+ ${VISUAL}${2}`
`308`	`308`	`}`
`309`	`309`	`endsnippet`
`310`	`310`
`@@ -405,14 +405,14 @@ endsnippet`
`405`	`405`	`snippet version "version (version)" b`
`406`	`406`	`version(${1:/version name/})`
`407`	`407`	`{`
`408`		`- ${VISUAL}${2:/code/}`
	`408`	`+ ${VISUAL}${2}`
`409`	`409`	`}`
`410`	`410`	`endsnippet`
`411`	`411`
`412`	`412`	`snippet debug "debug" b`
`413`	`413`	`debug`
`414`	`414`	`{`
`415`		`- ${VISUAL}${1:/code/}`
	`415`	`+ ${VISUAL}${1}`
`416`	`416`	`}`
`417`	`417`	`endsnippet`
`418`	`418`
`@@ -422,7 +422,7 @@ endsnippet`
`422`	`422`	`snippet temp "template (temp)" b`
`423`	`423`	`template ${2:/name/}(${1:/args/})`
`424`	`424`	`{`
`425`		`- ${3:/code/}`
	`425`	`+ ${3}`
`426`	`426`	`}`
`427`	`427`	`endsnippet`
`428`	`428`
`@@ -440,7 +440,7 @@ endsnippet`
`440`	`440`	`snippet unittest "unittest (unittest)" b`
`441`	`441`	`unittest`
`442`	`442`	`{`
`443`		`- ${1:/code/}`
	`443`	`+ ${1}`
`444`	`444`	`}`
`445`	`445`	`endsnippet`
`446`	`446`
`@@ -450,21 +450,21 @@ endsnippet`
`450`	`450`	`snippet opDis "opDispatch (opDis)" b`
`451`	`451`	`${1:/return type/} opDispatch(string s)()`
`452`	`452`	`{`
`453`		`- ${2:/code/};`
	`453`	`+ ${2};`
`454`	`454`	`}`
`455`	`455`	`endsnippet`
`456`	`456`
`457`	`457`	`snippet op= "opAssign (op=)" b`
`458`	`458`	`void opAssign(${1} rhs) ${2:@safe pure nothrow}`
`459`	`459`	`{`
`460`		`- ${2:/code/}`
	`460`	`+ ${2}`
`461`	`461`	`}`
`462`	`462`	`endsnippet`
`463`	`463`
`464`	`464`	`snippet opCmp "opCmp (opCmp)" b`
`465`	`465`	`int opCmp(${1} rhs) @safe const pure nothrow`
`466`	`466`	`{`
`467`		`- ${2:/code/}`
	`467`	`+ ${2}`
`468`	`468`	`}`
`469`	`469`	`endsnippet`
`470`	`470`
`@@ -484,7 +484,7 @@ endsnippet`
`484`	`484`	`snippet toString "toString (toString)" b`
`485`	`485`	`string toString() @safe const pure nothrow`
`486`	`486`	`{`
`487`		`- ${1:/code/}`
	`487`	`+ ${1}`
`488`	`488`	`}`
`489`	`489`	`endsnippet`
`490`	`490`