From dba38fc3824cb01a5858120eea8b668db1f0e885 Mon Sep 17 00:00:00 2001 From: "David C. Bishop" Date: Fri, 18 Apr 2014 18:02:36 +1000 Subject: [PATCH 1/4] Add 'priority -50' to rust.snippets. --- UltiSnips/rust.snippets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets index 98a371f..71ea845 100644 --- a/UltiSnips/rust.snippets +++ b/UltiSnips/rust.snippets @@ -2,6 +2,8 @@ # Rust Snippets # ####################################################################### +priority -50 + ############### # Functions # ############### From 7af4b8f424e4783eb4cdb0b568eae90b75d34e5d Mon Sep 17 00:00:00 2001 From: "David C. Bishop" Date: Fri, 18 Apr 2014 18:04:17 +1000 Subject: [PATCH 2/4] Remove /* code */ placeholders in rust.snippets. --- UltiSnips/rust.snippets | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets index 71ea845..b4b03e2 100644 --- a/UltiSnips/rust.snippets +++ b/UltiSnips/rust.snippets @@ -9,14 +9,14 @@ priority -50 ############### snippet fn "A function, optionally with arguments and return type." fn ${1:function_name}(${2})${3/..*/ -> /}${3} { - ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}} + ${VISUAL}${0} } endsnippet snippet test "Test function" #[test] fn ${1:test_function_name}() { - ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}} + ${VISUAL}${0} } endsnippet @@ -55,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 @@ -97,7 +97,7 @@ endsnippet snippet if "if .. (if)" b if ${1:/* condition */} { - ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}} + ${VISUAL}${0} } endsnippet @@ -109,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 @@ -146,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 { @@ -180,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 @@ -198,7 +198,7 @@ endsnippet ############ snippet trait "Trait block" b trait ${1:Name} { - ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}} + ${VISUAL}${0} } endsnippet From 28fc19552f33f34421eea9b2861aa1e2eb339cb6 Mon Sep 17 00:00:00 2001 From: "David C. Bishop" Date: Fri, 18 Apr 2014 18:08:13 +1000 Subject: [PATCH 3/4] Add b option to rust snippets. --- UltiSnips/rust.snippets | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets index b4b03e2..9985226 100644 --- a/UltiSnips/rust.snippets +++ b/UltiSnips/rust.snippets @@ -7,26 +7,26 @@ 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} } endsnippet -snippet test "Test function" +snippet test "Test function" b #[test] fn ${1:test_function_name}() { ${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} } @@ -34,7 +34,7 @@ endsnippet -snippet let "A let statement" +snippet let "A let statement" b let ${1:name}${3} = ${VISUAL}${2}; endsnippet From 7b5d7de5e9d7cbf092ca2cbb51065de0602efca6 Mon Sep 17 00:00:00 2001 From: "David C. Bishop" Date: Fri, 18 Apr 2014 18:10:50 +1000 Subject: [PATCH 4/4] Remove /* code */ placeholders from c, cpp and d. --- UltiSnips/c.snippets | 22 ++++++++--------- UltiSnips/cpp.snippets | 2 +- UltiSnips/d.snippets | 56 +++++++++++++++++++++--------------------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets index 5b8eae8..21dd87b 100644 --- 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,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 diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets index 3d79a64..c2cb3d0 100644 --- 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 index 99da292..264c9d5 100644 --- 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,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