Merge remote-tracking branch 'origin/master'

Conflicts:
	UltiSnips/java.snippets
This commit is contained in:
Tom Cammann 2013-01-28 21:19:30 +00:00
commit 42cf7e82ad
3 changed files with 23 additions and 10 deletions

View File

@ -37,6 +37,10 @@ snippet /o|v/ "new Object or variable" !br
${1:Object} ${2:var} = new ${2}(${3}); ${1:Object} ${2:var} = new ${2}(${3});
endsnippet endsnippet
snippet f "field" !b
${1:private} ${2:String} ${3:`!p snip.rv = t[2].lower()`};
endsnippet
snippet ab "abstract" b snippet ab "abstract" b
abstract abstract
endsnippet endsnippet
@ -70,9 +74,10 @@ snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent} }${4:implements
endsnippet endsnippet
snippet clc "class" b snippet clc "class" b
public class ${1:`!p public class `!p
snip.rv = snip.basename or "untitled"`} { snip.rv = snip.basename or "untitled"` {
public $1(${2:}) {
public `!p snip.rv = snip.basename or "untitled"`($2) {
$0 $0
} }
} }
@ -126,6 +131,11 @@ for ( int i = 0; i < $1; i++ )`!p nl(snip)`{
} }
endsnippet endsnippet
snippet fori "for with int" b
for ( int i = 0; i < $1; i++ )`!p nl(snip)`{
$0
}
snippet for "for" b snippet for "for" b
for ($1; $2; $3)`!p nl(snip)`{ for ($1; $2; $3)`!p nl(snip)`{
$0 $0
@ -157,18 +167,21 @@ snippet cc "setter body"
this.${1:var} = $1; this.${1:var} = $1;
endsnippet endsnippet
snippet list "Collections List" b snippet list "List"
List<${1:String}> ${2:list} = new ${3:Array}List<$1>(); List<${1:String}> ${2:list} = new ${3:Array}List<$1>();
endsnippet endsnippet
snippet map "Collections Map" b snippet map "Map"
Map<${1:String}, ${2:String}> ${3:map} = new ${4:Hash}Map<$1, $2>(); Map<${1:String}, ${2:String}> ${3:map} = new ${4:Hash}Map<$1, $2>();
endsnippet endsnippet
snippet set "Collections Set" !b snippet set "Set" !b
Set<${1:String}> ${2:set} = new ${3:Hash}Set<$1>(); Set<${1:String}> ${2:set} = new ${3:Hash}Set<$1>();
endsnippet endsnippet
snippet /s(tr)?/ "String" !b
String
endsnippet
snippet cn "Constructor" !b snippet cn "Constructor" !b
public `!p snip.rv = snip.basename or "untitled"`(${1:}) { public `!p snip.rv = snip.basename or "untitled"`(${1:}) {
@ -323,10 +336,6 @@ snippet th "throw" b
throw new $0 throw new $0
endsnippet endsnippet
snippet f "field" !b
${1:private} ${2:String} ${3:`!p snip.rv = t[2].lower()`};
endsnippet
snippet wh "while" b snippet wh "while" b
while ($1)`!p nl(snip)`{ while ($1)`!p nl(snip)`{
$0 $0

View File

@ -1271,6 +1271,7 @@ Contributors listed in chronological order:
Pedro Algarvio - s0undt3ch Pedro Algarvio - s0undt3ch
Eric Van Dewoestine - ervandew Eric Van Dewoestine - ervandew
Matt Patterson - fidothe Matt Patterson - fidothe
Mike Morearty - mmorearty
7.2 Snippets *UltiSnips-contrisnippets* 7.2 Snippets *UltiSnips-contrisnippets*
@ -1308,6 +1309,7 @@ Contributors listed in chronological order:
Björn Winckler (b4winckler) Björn Winckler (b4winckler)
David Brown (Nali4Freedom) David Brown (Nali4Freedom)
Harry Xu (harryxu) Harry Xu (harryxu)
Tom Cammann (takac)
Thank you for your support. Thank you for your support.

View File

@ -4,6 +4,8 @@
setlocal foldmethod=syntax setlocal foldmethod=syntax
setlocal foldlevel=99 setlocal foldlevel=99
setlocal commentstring=#%s
" Define match words for use with matchit plugin " Define match words for use with matchit plugin
" http://www.vim.org/scripts/script.php?script_id=39 " http://www.vim.org/scripts/script.php?script_id=39
if exists("loaded_matchit") && !exists("b:match_words") if exists("loaded_matchit") && !exists("b:match_words")