Merge #381

381: Explicitly set the "exit" point on some snippets. r=ehuss a=ehuss

Often when using a snippet, when you tab into the main "body" of the snippet, it
is still in snippet mode. This means that hitting tab will exit the body. This
is almost never what I want, since it disables tab completion.

Co-authored-by: Eric Huss <[email protected]>

Author: bors[bot]

snippets/Ok.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <content><![CDATA[Ok(${1:result})]]></content>
+    <content><![CDATA[Ok(${0:result})]]></content>
     <tabTrigger>Ok</tabTrigger>
     <scope>source.rust</scope>
     <description>Ok(…)</description>

snippets/Some.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <content><![CDATA[Some(${1})]]></content>
+    <content><![CDATA[Some(${0})]]></content>
     <tabTrigger>Some</tabTrigger>
     <scope>source.rust</scope>
     <description>Some(…)</description>

snippets/bench.sublime-snippet

@@ -2,7 +2,7 @@
     <content><![CDATA[
 #[bench]
 fn ${1:name}(b: &mut test::Bencher) {
-	${2:b.iter(|| ${3:/* benchmark code */})}
+	${2:b.iter(|| ${0:/* benchmark code */})}
 }]]></content>
     <tabTrigger>bench</tabTrigger>
     <scope>source.rust</scope>

snippets/extern-fn.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[extern "C" fn ${1:name}(${2:arg}: ${3:Type}) -> ${4:RetType} {
-	${5:// add code here}
+	${0:// add code here}
 }]]></content>
     <tabTrigger>extern-fn</tabTrigger>
     <scope>source.rust</scope>

snippets/extern-mod.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[extern "C" {
-	${2:// add code here}
+	${0:// add code here}
 }]]></content>
     <tabTrigger>extern-mod</tabTrigger>
     <scope>source.rust</scope>

snippets/fn.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[fn ${1:name}(${2:arg}: ${3:Type}) ${4/(^.+$)|^$/(?1:-> :)/}${4:RetType}${4/(^.+$)|^$/(?1: :)/}{
-	${5:unimplemented!()}
+	${0:unimplemented!()}
 }]]></content>
     <tabTrigger>fn</tabTrigger>
     <scope>source.rust</scope>

snippets/for.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[for ${1:pat} in ${2:expr} {
-	${3:unimplemented!();}
+	${0:unimplemented!();}
 }]]></content>
     <tabTrigger>for</tabTrigger>
     <scope>source.rust</scope>

snippets/if-let.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[if let ${1:Some(pat)} = ${2:expr} {
-	${3:unimplemented!();}
+	${0:unimplemented!();}
 }]]></content>
     <tabTrigger>if-let</tabTrigger>
     <scope>source.rust</scope>

snippets/if.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[if ${1:condition} {
-	${2:unimplemented!();}
+	${0:unimplemented!();}
 }]]></content>
     <tabTrigger>if</tabTrigger>
     <scope>source.rust</scope>

snippets/impl-trait.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[impl ${1:Trait} for ${2:Type} {
-	${3:// add code here}
+	${0:// add code here}
 }]]></content>
     <tabTrigger>impl-trait</tabTrigger>
     <scope>source.rust</scope>