Skip to content

Commit ebbd6a8

Browse files
author
Felix Jung
committed
Merge remote-tracking branch 'upstream/master'
2 parents aefcab6 + fa8778d commit ebbd6a8

File tree

11 files changed

+174
-60
lines changed

11 files changed

+174
-60
lines changed

‎UltiSnips/c.snippets‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endsnippet
1616

1717
snippet #if "#if #endif" b
1818
#if ${1:0}
19-
${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
19+
${VISUAL}${0}
2020
#endif
2121
endsnippet
2222

@@ -40,22 +40,22 @@ endsnippet
4040
snippet main "main() (main)"
4141
int main(int argc, char *argv[])
4242
{
43-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
43+
${VISUAL}${0}
4444
return 0;
4545
}
4646
endsnippet
4747

4848
snippet for "for loop (for)"
4949
for (${2:i} = 0; $2 < ${1:count}; ${3:++$2})
5050
{
51-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
51+
${VISUAL}${0}
5252
}
5353
endsnippet
5454

5555
snippet fori "for int loop (fori)"
5656
for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
5757
{
58-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
58+
${VISUAL}${0}
5959
}
6060
endsnippet
6161

@@ -86,13 +86,13 @@ endsnippet
8686

8787
snippet wh "while loop"
8888
while(${1:/* condition */}) {
89-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
89+
${VISUAL}${0}
9090
}
9191
endsnippet
9292

9393
snippet do "do...while loop (do)"
9494
do {
95-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
95+
${VISUAL}${0}
9696
} while(${1:/* condition */});
9797
endsnippet
9898

@@ -103,26 +103,26 @@ endsnippet
103103
snippet if "if .. (if)"
104104
if (${1:/* condition */})
105105
{
106-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
106+
${VISUAL}${0}
107107
}
108108
endsnippet
109109

110110
snippet el "else .. (else)"
111111
else {
112-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
112+
${VISUAL}${0}
113113
}
114114
endsnippet
115115

116116
snippet eli "else if .. (eli)"
117117
else if (${1:/* condition */}) {
118-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
118+
${VISUAL}${0}
119119
}
120120
endsnippet
121121

122122
snippet ife "if .. else (ife)"
123123
if (${1:/* condition */})
124124
{
125-
${2:/* code */}
125+
${2}
126126
}
127127
else
128128
{
@@ -144,7 +144,7 @@ endsnippet
144144
snippet fun "function" b
145145
${1:void} ${2:function_name}(${3})
146146
{
147-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
147+
${VISUAL}${0}
148148
}
149149
endsnippet
150150

‎UltiSnips/cpp.snippets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ endsnippet
2727
snippet ns "namespace .. (namespace)"
2828
namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
2929
{
30-
${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
30+
${VISUAL}${0}
3131
}${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
3232
endsnippet
3333

‎UltiSnips/d.snippets‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ endsnippet
106106
snippet if "if .. (if)"
107107
if(${1:/*condition*/})
108108
{
109-
${VISUAL}${0:/*code*/}
109+
${VISUAL}${0}
110110
}
111111
endsnippet
112112

113113
snippet ife "if .. else (ife)" b
114114
if(${1:/*condition*/})
115115
{
116-
${2:/*code*/}
116+
${2}
117117
}
118118
else
119119
{
@@ -124,25 +124,25 @@ endsnippet
124124
snippet el "else (el)" b
125125
else
126126
{
127-
${VISUAL}${1:/*code*/}
127+
${VISUAL}${1}
128128
}
129129
endsnippet
130130

131131
snippet elif "else if (elif)" b
132132
else if(${1:/*condition*/})
133133
{
134-
${VISUAL}${0:/*code*/}
134+
${VISUAL}${0}
135135
}
136136
endsnippet
137137

138138
snippet sw "switch (sw)"
139139
switch(${1:/*var*/})
140140
{
141141
case ${2:/*value*/}:
142-
${3:/*code*/}
142+
${3}
143143
break;
144144
case ${4:/*value*/}:
145-
${5:/*code*/}
145+
${5}
146146
break;
147147
${7:/*more cases*/}
148148
default:
@@ -154,18 +154,18 @@ snippet fsw "final switch (fsw)"
154154
switch(${1:/*var*/})
155155
{
156156
case ${2:/*value*/}:
157-
${3:/*code*/}
157+
${3}
158158
break;
159159
case ${4:/*value*/}:
160-
${5:/*code*/}
160+
${5}
161161
break;
162162
${7:/*more cases*/}
163163
}
164164
endsnippet
165165

166166
snippet case "case (case)" b
167167
case ${1:/*value*/}:
168-
${2:/*code*/}
168+
${2}
169169
break;
170170
endsnippet
171171

@@ -178,42 +178,42 @@ endsnippet
178178
snippet do "do while (do)" b
179179
do
180180
{
181-
${VISUAL}${2:/*code*/}
181+
${VISUAL}${2}
182182
} while(${1:/*condition*/});
183183
endsnippet
184184

185185
snippet wh "while (wh)" b
186186
while(${1:/*condition*/})
187187
{
188-
${VISUAL}${2:/*code*/}
188+
${VISUAL}${2}
189189
}
190190
endsnippet
191191

192192
snippet for "for (for)" b
193193
for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
194194
{
195-
${VISUAL}${0:/*code*/}
195+
${VISUAL}${0}
196196
}
197197
endsnippet
198198

199199
snippet forever "forever (forever)" b
200200
for(;;)
201201
{
202-
${VISUAL}${0:/*code*/}
202+
${VISUAL}${0}
203203
}
204204
endsnippet
205205

206206
snippet fore "foreach (fore)"
207207
foreach(${1:/*elem*/}; ${2:/*range*/})
208208
{
209-
${VISUAL}${3:/*code*/}
209+
${VISUAL}${3}
210210
}
211211
endsnippet
212212

213213
snippet forif "foreach if (forif)" b
214214
foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
215215
{
216-
${VISUAL}${4:/*code*/}
216+
${VISUAL}${4}
217217
}
218218
endsnippet
219219

@@ -249,21 +249,21 @@ endsnippet
249249
snippet fun "function definition (fun)"
250250
${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
251251
{
252-
${VISUAL}${5:/*code*/}
252+
${VISUAL}${5}
253253
}
254254
endsnippet
255255

256256
snippet void "void function definition (void)"
257257
void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
258258
{
259-
${VISUAL}${4:/*code*/}
259+
${VISUAL}${4}
260260
}
261261
endsnippet
262262

263263
snippet this "ctor (this)" w
264264
this(${1:/*args*/})
265265
{
266-
${VISUAL}${2:/*code*/}
266+
${VISUAL}${2}
267267
}
268268
endsnippet
269269

@@ -295,7 +295,7 @@ endsnippet
295295
snippet scope "scope (scope)" b
296296
scope(${1:exit})
297297
{
298-
${VISUAL}${2:/*code*/}
298+
${VISUAL}${2}
299299
}
300300
endsnippet
301301

@@ -304,7 +304,7 @@ endsnippet
304304
snippet with "with (with)"
305305
with(${1})
306306
{
307-
${VISUAL}${2:/*code*/}
307+
${VISUAL}${2}
308308
}
309309
endsnippet
310310

@@ -405,14 +405,14 @@ endsnippet
405405
snippet version "version (version)" b
406406
version(${1:/*version name*/})
407407
{
408-
${VISUAL}${2:/*code*/}
408+
${VISUAL}${2}
409409
}
410410
endsnippet
411411

412412
snippet debug "debug" b
413413
debug
414414
{
415-
${VISUAL}${1:/*code*/}
415+
${VISUAL}${1}
416416
}
417417
endsnippet
418418

@@ -422,7 +422,7 @@ endsnippet
422422
snippet temp "template (temp)" b
423423
template ${2:/*name*/}(${1:/*args*/})
424424
{
425-
${3:/*code*/}
425+
${3}
426426
}
427427
endsnippet
428428

@@ -440,7 +440,7 @@ endsnippet
440440
snippet unittest "unittest (unittest)" b
441441
unittest
442442
{
443-
${1:/*code*/}
443+
${1}
444444
}
445445
endsnippet
446446

@@ -450,21 +450,21 @@ endsnippet
450450
snippet opDis "opDispatch (opDis)" b
451451
${1:/*return type*/} opDispatch(string s)()
452452
{
453-
${2:/*code*/};
453+
${2};
454454
}
455455
endsnippet
456456

457457
snippet op= "opAssign (op=)" b
458458
void opAssign(${1} rhs) ${2:@safe pure nothrow}
459459
{
460-
${2:/*code*/}
460+
${2}
461461
}
462462
endsnippet
463463

464464
snippet opCmp "opCmp (opCmp)" b
465465
int opCmp(${1} rhs) @safe const pure nothrow
466466
{
467-
${2:/*code*/}
467+
${2}
468468
}
469469
endsnippet
470470

@@ -484,7 +484,7 @@ endsnippet
484484
snippet toString "toString (toString)" b
485485
string toString() @safe const pure nothrow
486486
{
487-
${1:/*code*/}
487+
${1}
488488
}
489489
endsnippet
490490

‎UltiSnips/javascript_angular.snippets‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
priority -50
2+
3+
snippet iti "it (js, inject)" b
4+
it('${1:description}', inject(function($2) {
5+
$0
6+
}));
7+
endsnippet
8+
9+
snippet befi "before each (js, inject)" b
10+
beforeEach(inject(function($1) {
11+
$0
12+
}));
13+
endsnippet
14+
15+
snippet aconf "angular config" i
16+
config(function($1) {
17+
$0
18+
});
19+
endsnippet
20+
21+
snippet acont "angular controller" i
22+
controller('${1:name}', function($2) {
23+
$0
24+
});
25+
endsnippet

‎UltiSnips/markdown.snippets‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,15 @@ snippet img "Image"
3939
![${1:pic alt}](${2:path}${3/.+/ "/}${3:opt title}${3/.+/"/})$0
4040
endsnippet
4141

42+
snippet ilc "Inline Code" i
43+
\`$1\`$0
44+
endsnippet
45+
46+
snippet cbl "Codeblock" b
47+
\`\`\`
48+
$1
49+
\`\`\`
50+
$0
51+
endsnippet
52+
4253
# vim:ft=snippets:

‎UltiSnips/pandoc.snippets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
priority -49
2+
3+
extends markdown

‎UltiSnips/r.snippets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ while(${1}) {
4848
endsnippet
4949

5050
snippet for "for loop"
51-
for ({${1:item} in ${2:list}) {
51+
for (${1:item} in ${2:list}) {
5252
${3}
5353
}
5454
endsnippet

0 commit comments

Comments
 (0)