diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets index e6ea2f9d2..113624349 100644 --- a/UltiSnips/c.snippets +++ b/UltiSnips/c.snippets @@ -4,6 +4,16 @@ priority -50 +snippet bcomment "block comment" +/* + * ${1} + */ +endsnippet + +snippet lcomment "line comment" +/* $1 */ +endsnippet + snippet def "#define ..." #define ${1} endsnippet @@ -21,11 +31,11 @@ ${VISUAL}${0} endsnippet snippet inc "#include local header (inc)" -#include "${1:`!p snip.rv = snip.basename + '.h'`}" +#include "${1:`!p snip.rv = snip.basename + '.h'`}"${2} endsnippet snippet Inc "#include <> (Inc)" -#include <${1:.h}> +#include <${1:.h}>${2} endsnippet snippet mark "#pragma mark (mark)" @@ -38,24 +48,28 @@ $0 endsnippet snippet main "main() (main)" -int main(int argc, char *argv[]) -{ +int main(int argc, const char *argv[]) { ${VISUAL}${0} + return 0; } endsnippet snippet for "for loop (for)" -for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) -{ - ${VISUAL}${0} +for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) { + ${VISUAL}${4} +} +endsnippet + +snippet forp "for pointer loop (for)" +for (${1:p} = ${2}; $1 != NULL; $1 = $1->${3}) { + ${VISUAL}${4} } endsnippet snippet fori "for int loop (fori)" -for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) -{ - ${VISUAL}${0} +for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) { + ${VISUAL}${4} } endsnippet @@ -86,14 +100,14 @@ endsnippet snippet wh "while loop" while(${1:/* condition */}) { - ${VISUAL}${0} + ${VISUAL}${2} } endsnippet snippet do "do...while loop (do)" do { - ${VISUAL}${0} -} while(${1:/* condition */}); + ${VISUAL}${1} +} while(${2:/* condition */}); endsnippet snippet fprintf "fprintf ..." @@ -101,31 +115,28 @@ fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|% endsnippet snippet if "if .. (if)" -if (${1:/* condition */}) -{ - ${VISUAL}${0} +if (${1:/* condition */}) { + ${VISUAL}${2} } endsnippet snippet el "else .. (else)" else { - ${VISUAL}${0} + ${VISUAL}${1} } endsnippet snippet eli "else if .. (eli)" else if (${1:/* condition */}) { - ${VISUAL}${0} + ${VISUAL}${2} } endsnippet snippet ife "if .. else (ife)" -if (${1:/* condition */}) -{ +if (${1:/* condition */}) { ${2} } -else -{ +else { ${3:/* else */} } endsnippet @@ -135,16 +146,20 @@ printf("${1:%s}\n"${1/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$2${1/([^%]|%%)*(%.)?.*/(?2 endsnippet snippet st "struct" -struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} -{ - ${0:/* data */} +struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} { + ${2:/* data */} }; endsnippet +snippet std "struct" +typedef struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} { + ${2:/* data */} +}${3}; +endsnippet + snippet fun "function" b -${1:void} ${2:function_name}(${3}) -{ - ${VISUAL}${0} +${1:void} ${2:function_name}(${3}) { + ${VISUAL}${4} } endsnippet diff --git a/UltiSnips/objc.snippets b/UltiSnips/objc.snippets index 45e41fc15..eac994e1d 100644 --- a/UltiSnips/objc.snippets +++ b/UltiSnips/objc.snippets @@ -1,5 +1,9 @@ priority -50 +extends c + +priority -49 + ########################################################################### # TextMate Snippets # ########################################################################### @@ -9,7 +13,7 @@ snippet imp "#import (imp)" b endsnippet snippet Imp "#import <> (Imp)" -#import <${1:Cocoa/Cocoa.h}> +#import <${1:Foundation/Foundation.h}> endsnippet snippet cl "020 Class (objc)" @@ -174,9 +178,9 @@ $0 endsnippet snippet pool "NSAutoreleasePool (pool)" -NSAutoreleasePool *pool = [NSAutoreleasePool new]; -$0 -[pool drain]; +@autoreleasepool { + $0 +} endsnippet snippet log "NSLog (log) 2" @@ -205,7 +209,7 @@ snippet objacc "Object Accessors Interface (objacc)" endsnippet snippet prop "Property" -@property (${1/^(e)$|.*/(?1:r)/}${1:r}${1/^(?:(r)|(e)|(c)|(a))$|.*/(?1:etain)(?2:adonly)(?3:opy)(?4:ssign)/}) ${2:NSSomeClass}$ *${3:${2/^[A-Z](?:[A-Z]+|[a-z]+)([A-Z]\w*)/\l$1/}}; +@property (${1/^(e)$|.*/(?1:r)/}${1:r}${1/^(?:(r)|(e)|(c)|(a))$|.*/(?1:etain)(?2:adonly)(?3:opy)(?4:ssign)/}) ${2:NSSomeClass} *${3:${2/^[A-Z](?:[A-Z]+|[a-z]+)([A-Z]\w*)/\l$1/}}; endsnippet snippet getprefs "Read from defaults (getprefs)" diff --git a/snippets/html.snippets b/snippets/html.snippets index 3642bbca7..2f74e53d0 100644 --- a/snippets/html.snippets +++ b/snippets/html.snippets @@ -836,3 +836,5 @@ snippet video